From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [obsolete] linux-next-git-rejects.patch removed from -mm tree Date: Wed, 19 Dec 2012 12:38:25 -0800 Message-ID: <20121219203826.370FA200057@hpza10.eem.corp.google.com> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail-bk0-f74.google.com ([209.85.214.74]:61056 "EHLO mail-bk0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752080Ab2LSUi2 (ORCPT ); Wed, 19 Dec 2012 15:38:28 -0500 Received: by mail-bk0-f74.google.com with SMTP id je9so133692bkc.5 for ; Wed, 19 Dec 2012 12:38:27 -0800 (PST) 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 removed from the -mm tree. Its filename was linux-next-git-rejects.patch This patch was dropped because it is obsolete ------------------------------------------------------ From: Andrew Morton Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- drivers/dma/dmatest.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN drivers/mfd/sta2x11-mfd.c~linux-next-git-rejects drivers/mfd/sta2x11-mfd.c diff -puN net/dns_resolver/dns_key.c~linux-next-git-rejects net/dns_resolver/dns_key.c diff -puN drivers/dma/dmatest.c~linux-next-git-rejects drivers/dma/dmatest.c --- a/drivers/dma/dmatest.c~linux-next-git-rejects +++ a/drivers/dma/dmatest.c @@ -228,7 +228,6 @@ static void dmatest_callback(void *arg) wake_up_all(done->wait); } -<<<<<<< HEAD static inline void unmap_src(struct device *dev, dma_addr_t *addr, size_t len, unsigned int count) { @@ -241,13 +240,13 @@ static inline void unmap_dst(struct devi { while (count--) dma_unmap_single(dev, addr[count], len, DMA_BIDIRECTIONAL); -======= +} + static unsigned int min_odd(unsigned int x, unsigned int y) { unsigned int val = min(x, y); return val % 2 ? val : val - 1; ->>>>>>> linux-next/akpm-base } /* _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch linux-next.patch linux-next-rejects.patch make-my-i386-build-work.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid.patch drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists.patch sgi-xp-handle-non-fatal-traps-fix.patch arch-x86-tools-insn_sanityc-identify-source-of-messages.patch fb-rework-locking-to-fix-lock-ordering-on-takeover-fix.patch fb-rework-locking-to-fix-lock-ordering-on-takeover-fix-2.patch block-remove-deadlock-in-disk_clear_events.patch block-prevent-race-cleanup.patch mm.patch drop_caches-add-some-documentation-and-info-messsge.patch memcg-debugging-facility-to-access-dangling-memcgs-fix.patch scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes.patch sendfile-allows-bypassing-of-notifier-events.patch binfmt_elfc-use-get_random_int-to-fix-entropy-depleting.patch rtc-ds1307-long-block-operations-bugfix-fix.patch rtc-max77686-add-maxim-77686-driver-fix.patch hfsplus-add-osx-prefix-for-handling-namespace-of-mac-os-x-extended-attributes.patch hfsplus-rework-processing-of-hfs_btree_write-returned-error.patch ipc-add-sysctl-to-specify-desired-next-object-id.patch ipc-message-queue-receive-cleanup.patch ipc-convert-prepare_copy-from-macro-to-function.patch dma-debug-new-interfaces-to-debug-dma-mapping-errors-fix-fix.patch fs-notify-add-procfs-fdinfo-helper-v7-fix.patch journal_add_journal_head-debug.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch