The patch titled Subject: linux-next-git-rejects has been removed from the -mm tree. Its filename was linux-next-git-rejects.patch This patch was dropped because it is obsolete ------------------------------------------------------ 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 proc-fix-proc-net-after-setns2-checkpatch-fixes.patch proc-fix-proc-net-after-setns2-checkpatch-fixes-fix.patch mmmemory_hotplug-fix-scan_movable_pages-for-gigantic-hugepages-fix.patch ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch mm.patch mm-slub-introduce-slab_warn_on_error-fix.patch 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 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 mmslabvmscan-accumulate-gradual-pressure-on-small-slabs-fix.patch mm-proportional-memorylowmin-reclaim-checkpatch-fixes.patch mm-oom-remove-prefer-children-over-parent-heuristic-checkpatch-fixes.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