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 Aug 2010 15:14:09 -0700 Message-ID: <201008242210.o7OMAjjG017605@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:41137 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932087Ab0HXWLd (ORCPT ); Tue, 24 Aug 2010 18:11:33 -0400 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 o7OMAkuZ031471 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 24 Aug 2010 15:10:46 -0700 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/mmu_context.h | 3 --- drivers/platform/x86/Kconfig | 3 --- 2 files changed, 6 deletions(-) diff -puN arch/s390/include/asm/mmu_context.h~linux-next-git-rejects arch/s390/include/asm/mmu_context.h --- a/arch/s390/include/asm/mmu_context.h~linux-next-git-rejects +++ a/arch/s390/include/asm/mmu_context.h @@ -18,10 +18,7 @@ static inline int init_new_context(struc struct mm_struct *mm) { atomic_set(&mm->context.attach_count, 0); -<<<<<<< HEAD mm->context.flush_mm = 0; -======= ->>>>>>> FETCH_HEAD mm->context.asce_bits = _ASCE_TABLE_LENGTH | _ASCE_USER_BITS; #ifdef CONFIG_64BIT mm->context.asce_bits |= _ASCE_TYPE_REGION3; diff -puN drivers/platform/x86/Kconfig~linux-next-git-rejects drivers/platform/x86/Kconfig --- a/drivers/platform/x86/Kconfig~linux-next-git-rejects +++ a/drivers/platform/x86/Kconfig @@ -495,12 +495,9 @@ config ACPI_TOSHIBA depends on BACKLIGHT_CLASS_DEVICE depends on INPUT depends on RFKILL || RFKILL = n -<<<<<<< HEAD select INPUT_POLLDEV -======= select INPUT_SPARSEKMAP select BACKLIGHT_CLASS_DEVICE ->>>>>>> FETCH_HEAD ---help--- This driver adds support for access to certain system settings on "legacy free" Toshiba laptops. These laptops can be recognized by _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch fs-inodec-work-around-bug.patch i-need-old-gcc.patch mm-vmap-area-cache.patch parport-prevent-arm-boards-frmo-crashing-when-cups-is-loaded-fix.patch gcc-46-btrfs-clean-up-unused-variables-bugs.patch hpet-factor-timer-allocate-from-open.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch security-add-const-to-security_task_setscheduler.patch sched-make-sched_param-argument-static-variables-in-some-sched_setscheduler-caller.patch fs-bio-integrityc-return-enomem-on-kmalloc-failure.patch usb-storage-add-new-no_read_disc_info-quirk-fix.patch mm.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch sdhci-support-10-bit-divided-clock-mode-for-spec-30-checkpatch-fixes.patch sdhci-get-rid-of-card-detect-work-fix.patch checkpatch-returning-errno-typically-should-be-negative.patch cgroup_freezer-update_freezer_state-does-incorrect-state-transitions-checkpatch-fixes.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command-checkpatch-fixes.patch pps-add-async-pps-event-handler-fix.patch memstick-add-driver-for-ricoh-r5c592-card-reader-cleanups.patch vfs-add-super-operation-writeback_inodes-fix.patch reiser4-export-remove_from_page_cache-fix.patch reiser4-export-find_get_pages.patch reiser4.patch reiser4-writeback_inodes-implementation-fix.patch reiser4-fixups.patch reiser4-broke.patch journal_add_journal_head-debug.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.patch