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: Wed, 04 Mar 2009 10:32:54 -0800 Message-ID: <200903041832.n24IWsJ0020103@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:40261 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753620AbZCDSd1 (ORCPT ); Wed, 4 Mar 2009 13:33:27 -0500 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n24IWsdM002385 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 4 Mar 2009 10:32:55 -0800 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 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/ ------------------------------------------------------ Subject: linux-next-git-rejects From: Andrew Morton Signed-off-by: Andrew Morton --- include/linux/rcupdate.h | 3 --- 1 file changed, 3 deletions(-) diff -puN include/linux/rcupdate.h~linux-next-git-rejects include/linux/rcupdate.h --- a/include/linux/rcupdate.h~linux-next-git-rejects +++ a/include/linux/rcupdate.h @@ -43,7 +43,6 @@ #include #include -<<<<<<< HEAD:include/linux/rcupdate.h /** * struct rcu_head - callback structure for use with RCU * @next: next update requests in a list @@ -57,8 +56,6 @@ struct rcu_head { /* Internal to kernel, but needed by rcupreempt.h. */ extern int rcu_scheduler_active; -======= ->>>>>>> FETCH_HEAD:include/linux/rcupdate.h #if defined(CONFIG_CLASSIC_RCU) #include #elif defined(CONFIG_TREE_RCU) _ Patches currently in -mm which might be from akpm@linux-foundation.org are i-need-old-gcc.patch i2c-too-much-compiler-noise.patch linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch git-acpi-vs-git-cpufreq.patch thinkpad-acpi-split-delayed-leds-stuff-clean-up-code.patch oprofile-dont-set-counter-width-from-cpuid-on-core2-checkpatch-fixes.patch kernel-auditscc-fix-warning.patch early-platform-driver-v3.patch sysfs-dont-block-indefinitely-for-unmapped-files-warning-fix.patch clocksource-pass-clocksource-to-read-callback.patch input-bcm5974-declare-alignment-usage.patch input-keyboard-introduce-lm8323-driver-checkpatch-fixes.patch leds-add-bd2802gu-led-driver.patch mmc-add-extended-csd-register-to-debugfs.patch mtd-rbtx4939-add-mtd-support.patch mtd-flex-onenand-support-fix.patch misdn-l1oip-reduce-stack-memory-footprint-cleanup.patch pci-quirks-unhide-overflow-device-on-i828675p-pe-chipsets-v2-checkpatch-fixes.patch raw-fix-rawctl-compat-ioctls-breakage-on-amd64-and-itanic.patch vfs-simple_set_mnt-should-return-void.patch __tty_open-use-the-correct-type-for-saved_flags.patch scsi-dpt_i2o-is-bust-on-ia64.patch ia64-fix-pci-dma-flag-propagation-on-sn-altix-with-pics-checkpatch-fixes.patch input-add-a-dmi-table-for-the-i8042reset-option-make-msi-wind-u-100-work.patch psmouse-synaptics-ensure-we-reset-the-device-on-resume-fix.patch nommu-fix-a-number-of-issues-with-the-per-mm-vma-patch.patch page_fault-retry-with-nopage_retry.patch page_fault-retry-with-nopage_retry-fix.patch page_fault-retry-with-nopage_retry-fix-fix.patch mm-add-proc-controls-for-pdflush-threads-fix.patch mm-add-proc-controls-for-pdflush-threads-fix-fix.patch mm-add-proc-controls-for-pdflush-threads-fix-99.patch proc-pid-maps-dont-show-pgoff-of-pure-anon-vmas-checkpatch-fixes.patch mm-introduce-for_each_populated_zone-macro-cleanup.patch mm-shrink_all_memory-use-scnr_reclaimed-checkpatch-fixes.patch mm-add-comment-why-mark_page_accessed-would-be-better-than-pte_mkyoung-in-follow_page-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch do_pipe-drop-its-last-user-in-arch-alpha-checkpatch-fixes.patch alpha-convert-u64-to-unsigned-long-long-fix.patch alpha-convert-u64-to-unsigned-long-long-fix-2.patch alpha-convert-u64-to-unsigned-long-long-fix-3-checkpatch-fixes.patch m68k-count-can-reach-51-not-50-checkpatch-fixes.patch ubd-stop-defintining-major_nr-checkpatch-fixes.patch epoll-keyed-wakeups-v2-teach-epoll-about-hints-coming-with-the-wakeup-key-checkpatch-fixes.patch rtc-convert-leap_year-into-an-inline.patch rtc-add-platform-driver-for-efi-fix.patch rtc-v3020-add-ability-to-access-v3020-chip-with-gpios-fix.patch rtc-test-before-subtraction-on-unsigned-fix.patch drivers-video-uvesafbc-dont-use-gfp_any.patch cirrusfb-convert-printks-to-dev_foo-fix.patch cirrusfb-convert-printks-to-dev_foo-fix-fix2.patch fbdev-uninline-lock_fb_info.patch fbdev-update-s1d13xxxfb-to-differ-between-revisions-and-production-ids-checkpatch-fixes.patch fbdev-update-s1d13xxxfb-to-differ-between-revisions-and-production-ids-simplification.patch ext3-use-unsigned-instead-of-int-for-type-of-blocksize-in-fs-ext3-nameic-fix.patch ext3-use-unsigned-instead-of-int-for-type-of-blocksize-in-fs-ext3-nameic-fix-checkpatch-fixes.patch memcg-fix-oom-killer-under-memcg-fix2.patch memcg-fix-oom-killer-under-memcg-fix.patch memcg-show-memcg-information-during-oom-fix2.patch memcg-show-memcg-information-during-oom-fix.patch memcg-show-memcg-information-during-oom-fix-fix-checkpatch-fixes.patch forget_original_parent-do-not-abuse-child-ptrace_entry-fix.patch pids-document-task_pgrp-task_session-is-not-safe-without-tasklist-rcu-fix.patch nbd-add-locking-to-nbd_ioctl-checkpatch-fixes.patch nbd-add-locking-to-nbd_ioctl-fix.patch namespaces-mqueue-namespace-adapt-sysctl-update-fix.patch edac-new-ppc4xx-driver-module-update-checkpatch-fixes.patch edac-new-ppc4xx-driver-module-update-checkpatch-fixes-checkpatch-fixes.patch kexec-add-dmesg-log-symbols-to-proc-vmcoreinfo-lists-fix.patch kexec-add-dmesg-log-symbols-to-proc-vmcoreinfo-lists-fix-fix.patch kexec-add-dmesg-log-symbols-to-proc-vmcoreinfo-lists-fix-fix-fix-fix.patch kexec-add-dmesg-log-symbols-to-proc-vmcoreinfo-lists-fix-fix-fix-checkpatch-fixes-cleanup.patch arch-x86-kernel-acpi-cstatec-avoid-using-work_on_cpu.patch arch-x86-kernel-cpu-cpufreq-acpi-cpufreqc-avoid-using-work_on_cpu.patch arch-x86-kernel-cpu-mcheck-mce_amd_64c-avoid-using-work_on_cpu.patch work_on_cpu-rewrite-it-to-create-a-kernel-thread-on-demand.patch nilfs2-integrated-block-mapping-remove-nilfs-bmap-wrapper-macros-checkpatch-fixes.patch nilfs2-inode-operations-fix.patch nilfs2-pathname-operations-fix.patch nilfs2-super-block-operations-fix.patch vfs-simple_set_mnt-should-return-void-fix-nilfs.patch nilfs2-segment-buffer-fix.patch reiser4-export-remove_from_page_cache-fix.patch reiser4.patch reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch