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, 27 Jan 2010 13:35:22 -0800 Message-ID: <201001272135.o0RLZMI8000800@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:39426 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756011Ab0A0VfY (ORCPT ); Wed, 27 Jan 2010 16:35:24 -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 o0RLZMC5006144 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 27 Jan 2010 13:35:23 -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 --- arch/s390/include/asm/irqflags.h | 5 ----- 1 file changed, 5 deletions(-) diff -puN arch/s390/include/asm/irqflags.h~linux-next-git-rejects arch/s390/include/asm/irqflags.h --- a/arch/s390/include/asm/irqflags.h~linux-next-git-rejects +++ a/arch/s390/include/asm/irqflags.h @@ -7,11 +7,6 @@ #define __ASM_IRQFLAGS_H #include -<<<<<<< HEAD:arch/s390/include/asm/irqflags.h - -#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2) -======= ->>>>>>> FETCH_HEAD:arch/s390/include/asm/irqflags.h /* store then or system mask. */ #define __raw_local_irq_stosm(__or) \ _ Patches currently in -mm which might be from akpm@linux-foundation.org are linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch i-need-old-gcc.patch revert-input-wistron_btns-switch-to-using-sparse-keymap-library.patch drivers-media-video-cx23885-needs-kfifo-conversion.patch ibmphp-read-the-length-of-ebda-and-map-entire-ebda-region-fix.patch pci-update-pci_set_vga_state-to-call-arch-functions-fix.patch cpufreq-ondemand-dont-synchronize-sample-rate-unless-mulitple-cpus-present-checkpatch-fixes.patch drivers-gpu-drm-radeon-radeon_combiosc-fix-warning.patch drivers-media-video-pmsc-needs-versionh.patch timer-stats-fix-del_timer_sync-and-try_to_del_timer_sync.patch jffs2-avoid-using-c-keyword-new-in-userspace-visible-header.patch 3x59x-fix-pci-resource-management.patch mm-avoid-false-sharing-of-mm_counter-checkpatch-fixes.patch mm-count-swap-usage-checkpatch-fixes.patch mm-add-lowmem-detection-logic-fix.patch mm-count-lowmem-rss-checkpatch-fixes.patch vmscan-check-high-watermark-after-shrink-zone-fix.patch mm-remove-function-free_hot_page-fix.patch mm-restore-zone-all_unreclaimable-to-independence-word-fix.patch memory-hotplug-create-sys-firmware-memmap-entry-for-new-memory-fix.patch include-linux-fsh-convert-fmode_-constants-to-hex.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch uml-linec-avoid-null-pointer-dereference-simplify.patch resources-introduce-generic-page_is_ram-fix.patch mm-pass-mm-flags-as-a-coredump-parameter-for-consistency-fix.patch memcg-move-charges-of-anonymous-page-cleanup.patch memcg-implement-memory-thresholds-checkpatch-fixes.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command-checkpatch-fixes.patch reiser4-export-remove_from_page_cache-fix.patch reiser4.patch reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.patch fs-reiser4-contextc-current_is_pdflush-got-removed.patch reiser4-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch notify_change-callers-must-hold-i_mutex.patch