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, 17 Nov 2011 12:19:39 -0800 Message-ID: <201111172019.pAHKJesK021318@wpaz5.hot.corp.google.com> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail-ey0-f202.google.com ([209.85.215.202]:59639 "EHLO mail-ey0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754203Ab1KQUTn (ORCPT ); Thu, 17 Nov 2011 15:19:43 -0500 Received: by eyg5 with SMTP id 5so48377eyg.1 for ; Thu, 17 Nov 2011 12:19:42 -0800 (PST) Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: akpm@linux-foundation.org The patch titled Subject: linux-next-git-rejects has been added to the -mm tree. Its filename is 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 *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Andrew Morton Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- drivers/staging/media/as102/as102_drv.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff -puN drivers/staging/media/as102/as102_drv.h~linux-next-git-rejects drivers/staging/media/as102/as102_drv.h --- a/drivers/staging/media/as102/as102_drv.h~linux-next-git-rejects +++ a/drivers/staging/media/as102/as102_drv.h @@ -27,14 +27,10 @@ #define DRIVER_FULL_NAME "Abilis Systems as10x usb driver" #define DRIVER_NAME "as10x_usb" -<<<<<<< HEAD -extern int as102_debug; #define debug as102_debug -======= -extern int debug; +extern int as102_debug; extern struct usb_driver as102_usb_driver; extern int elna_enable; ->>>>>>> linux-next/akpm-end #define dprintk(debug, args...) \ do { if (debug) { \ _ Subject: Subject: linux-next-git-rejects Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch linux-next.patch linux-next-git-rejects.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch vmscan-use-atomic-long-for-shrinker-batching.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch mrst-battery-fixes.patch x86-reduce-clock-calibration-time-during-slave-cpu-startup.patch debugobjects-extend-to-assert-that-an-object-is-initialized.patch kernel-timerc-use-debugobjects-to-catch-deletion-of-uninitialized-timers.patch drivers-message-fusion-mptbasec-ensure-nul-termination-of-mptcallbacksname-elements.patch loop-cleanup-set_status-interface.patch mm.patch mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes.patch mm-avoid-livelock-on-__gfp_fs-allocations-fix.patch mm-reduce-the-amount-of-work-done-when-updating-min_free_kbytes-checkpatch-fixes.patch include-linux-securityh-fix-security_inode_init_security-arg.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch treewide-convert-uses-of-attrib_noreturn-to-__noreturn-checkpatch-fixes.patch cgroup-fix-task-counter-common-ancestor-logic-checkpatch-fixes.patch mm-vmscan-distinguish-between-memcg-triggering-reclaim-and-memcg-being-scanned-checkpatch-fixes.patch procfs-introduce-the-proc-pid-map_files-directory-checkpatch-fixes.patch workqueue-make-alloc_workqueue-take-printf-fmt-and-args-for-name-fix.patch scatterlist-new-helper-functions.patch scatterlist-new-helper-functions-update-fix.patch memstick-add-support-for-legacy-memorysticks-fix.patch dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch memblock-add-input-size-checking-to-memblock_find_region.patch memblock-add-input-size-checking-to-memblock_find_region-fix.patch