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: Tue, 24 May 2016 10:49:57 -0700 Message-ID: <57449445.JBQDeI9kVcAeXejf%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]:60950 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752448AbcEXRt6 (ORCPT ); Tue, 24 May 2016 13:49:58 -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 --- tools/virtio/ringtest/Makefile | 7 ------- 1 file changed, 7 deletions(-) diff -puN tools/virtio/ringtest/Makefile~linux-next-git-rejects tools/virtio/ringtest/Makefile --- a/tools/virtio/ringtest/Makefile~linux-next-git-rejects +++ a/tools/virtio/ringtest/Makefile @@ -1,10 +1,6 @@ all: -<<<<<<< HEAD -all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder -======= all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder skb_array ->>>>>>> linux-next/akpm-base CFLAGS += -Wall CFLAGS += -pthread -O2 -ggdb @@ -20,10 +16,7 @@ ring: ring.o main.o virtio_ring_0_9: virtio_ring_0_9.o main.o virtio_ring_poll: virtio_ring_poll.o main.o virtio_ring_inorder: virtio_ring_inorder.o main.o -<<<<<<< HEAD -======= skb_array: skb_array.o main.o ->>>>>>> linux-next/akpm-base clean: -rm main.o -rm ring.o ring _ Patches currently in -mm which might be from akpm@linux-foundation.org are i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch mm-oom_reaper-do-not-mmput-synchronously-from-the-oom-reaper-context-fix-fix.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch mm.patch mm-check-the-return-value-of-lookup_page_ext-for-all-call-sites-fix.patch mm-check-the-return-value-of-lookup_page_ext-for-all-call-sites-checkpatch-fixes.patch mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch fs-nfs-nfs4statec-work-around-gcc-44-union-initialization-bug.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch linux-next-git-rejects.patch