The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/sched/core.c | 4 ----
kernel/time/posix-cpu-timers.c | 5 -----
2 files changed, 9 deletions(-)
--- a/kernel/sched/core.c~linux-next-git-rejects
+++ a/kernel/sched/core.c
@@ -421,11 +421,7 @@ void wake_q_add(struct wake_q_head *head
* state, even in the failed case, an explicit smp_mb() must be used.
*/
smp_mb__before_atomic();
-<<<<<<< HEAD
- if (cmpxchg_relaxed(&node->next, NULL, WAKE_Q_TAIL))
-=======
if (unlikely(cmpxchg_relaxed(&node->next, NULL, WAKE_Q_TAIL)))
->>>>>>> linux-next/akpm-base
return;
get_task_struct(task);
--- a/kernel/time/posix-cpu-timers.c~linux-next-git-rejects
+++ a/kernel/time/posix-cpu-timers.c
@@ -684,12 +684,7 @@ static int posix_cpu_timer_set(struct k_
* Install the new reload setting, and
* set up the signal and overrun bookkeeping.
*/
-<<<<<<< HEAD
- timer->it.cpu.incr = timespec64_to_ns(&new->it_interval);
- timer->it_interval = ns_to_ktime(timer->it.cpu.incr);
-=======
timer->it_interval = timespec64_to_ktime(new->it_interval);
->>>>>>> linux-next/akpm-base
/*
* This acts as a modification timestamp for the timer,
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
memory_hotplug-free-pages-as-higher-order-fix.patch
memory_hotplug-free-pages-as-higher-order-fix-fix.patch
mm-convert-pg_balloon-to-pg_offline-fix.patch
proc-fix-proc-net-after-setns2-checkpatch-fixes.patch
proc-fix-proc-net-after-setns2-checkpatch-fixes-fix.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-reuse-only-pte-mapped-ksm-page-in-do_wp_page-fix.patch
mm-swap-check-if-swap-backing-device-is-congested-or-not-fix.patch
mm-mmu_notifier-contextual-information-for-event-triggering-invalidation-v2-fix-fix.patch
filemap-kill-page_cache_read-usage-in-filemap_fault-fix.patch
filemap-drop-the-mmap_sem-for-all-blocking-operations-checkpatch-fixes.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
linux-next-rejects.patch
scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
