search

ni / linux

Linux kernel source for NI Linux Real-Time
Other
81 stars 78 forks source link

Merge tag 'v5.15.70-rt50' #82

Closed mike-petersen-ni closed 2 years ago

mike-petersen-ni commented 2 years ago

Conflicts

There was just one conflict.

kernel/time/timekeeping.c

line 1325@ours, 1330@theirs, 1324@resolved:

++<<<<<<< ours
 +      audit_tk_injoffset(ts_delta);
++||||||| base
++      if (!ret)
++              audit_tk_injoffset(ts_delta);
++=======
+       if (!ret) {
+               audit_tk_injoffset(ts_delta);
+               add_device_randomness(ts, sizeof(*ts));
+       }
++>>>>>>> theirs

Resolved in place by taking theirs but removing the conditional (as our patch removed the control flow making ret necessary):

        audit_tk_injoffset(ts_delta);
        add_device_randomness(ts, sizeof(*ts));

Testing