From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + linux-next-git-rejects.patch added to -mm tree Date: Thu, 19 May 2016 17:20:08 -0700 Message-ID: <573e5838.MCaB/UVNZl7r2gIJ%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:46869 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754590AbcETAUJ (ORCPT ); Thu, 19 May 2016 20:20:09 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org 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/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- samples/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff -puN samples/Makefile~linux-next-git-rejects samples/Makefile --- a/samples/Makefile~linux-next-git-rejects +++ a/samples/Makefile @@ -2,8 +2,4 @@ obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ trace_events/ livepatch/ \ hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \ -<<<<<<< HEAD - configfs/ v4l/ -======= configfs/ connector/ v4l/ ->>>>>>> linux-next/akpm-base _ Patches currently in -mm which might be from akpm@linux-foundation.org are include-linux-nodemaskh-create-next_node_in-helper.patch mm-hugetlbc-use-first_memory_node.patch mm-mempolicyc-offset_il_node-document-and-clarify.patch mm-uninline-page_mapped.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch mm.patch mm-compaction-abstract-compaction-feedback-to-helpers-fix.patch mm-oom-compaction-prevent-from-should_compact_retry-looping-for-ever-for-costly-orders-fix.patch mm-oom-protect-costly-allocations-some-more-for-config_compaction-checkpatch-fixes.patch vmstat-get-rid-of-the-ugly-cpu_stat_off-variable-v2-fix.patch mm-compact-fix-zoneindex-in-compact-fix.patch mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch procfs-fixes-pthread-cross-thread-naming-if-pr_dumpable-fix.patch exit_thread-remove-empty-bodies-fix.patch exit_thread-accept-a-task-parameter-to-be-exited-checkpatch-fixes.patch lib-gcd-use-binary-gcd-algorithm-instead-of-euclidean-fix.patch allocate-idle-task-for-a-cpu-always-on-its-local-node-fix.patch linux-next-rejects.patch drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch a.patch linux-next-git-rejects.patch