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, 11 Jan 2012 16:16:21 -0800 Message-ID: <20120112001621.826541E008B@wpzn4.hot.corp.google.com> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail-yx0-f202.google.com ([209.85.213.202]:39597 "EHLO mail-yx0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751102Ab2ALAQW (ORCPT ); Wed, 11 Jan 2012 19:16:22 -0500 Received: by yenm1 with SMTP id m1so25548yen.1 for ; Wed, 11 Jan 2012 16:16:21 -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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- drivers/leds/Kconfig | 4 +--- fs/9p/vfs_inode_dotl.c | 5 ----- fs/ext4/ioctl.c | 4 ---- fs/nfs/client.c | 4 ---- 4 files changed, 1 insertion(+), 16 deletions(-) diff -puN drivers/leds/Kconfig~linux-next-git-rejects drivers/leds/Kconfig --- a/drivers/leds/Kconfig~linux-next-git-rejects +++ a/drivers/leds/Kconfig @@ -388,7 +388,6 @@ config LEDS_RENESAS_TPU pin function. The latter to support brightness control. Brightness control is supported but hardware blinking is not. -<<<<<<< HEAD config LEDS_TCA6507 tristate "LED Support for TCA6507 I2C chip" depends on LEDS_CLASS && I2C @@ -396,14 +395,13 @@ config LEDS_TCA6507 This option enables support for LEDs connected to TC6507 LED driver chips accessed via the I2C bus. Driver support brightness control and hardware-assisted blinking. -======= + config LEDS_MAX8997 tristate "LED support for MAX8997 PMIC" depends on LEDS_CLASS && MFD_MAX8997 help This option enables support for on-chip LED drivers on MAXIM MAX8997 PMIC. ->>>>>>> linux-next/akpm-end config LEDS_TRIGGERS bool "LED Trigger support" diff -puN fs/9p/vfs_inode_dotl.c~linux-next-git-rejects fs/9p/vfs_inode_dotl.c --- a/fs/9p/vfs_inode_dotl.c~linux-next-git-rejects +++ a/fs/9p/vfs_inode_dotl.c @@ -283,13 +283,8 @@ v9fs_vfs_create_dotl(struct inode *dir, } name = (char *) dentry->d_name.name; -<<<<<<< HEAD - p9_debug(P9_DEBUG_VFS, "name:%s flags:0x%x mode:0x%hx\n", - name, flags, omode); -======= p9_debug(P9_DEBUG_VFS, "v9fs_vfs_create_dotl: name:%s flags:0x%x " "mode:0x%hx\n", name, flags, omode); ->>>>>>> linux-next/akpm-end dfid = v9fs_fid_lookup(dentry->d_parent); if (IS_ERR(dfid)) { diff -puN fs/ext4/ioctl.c~linux-next-git-rejects fs/ext4/ioctl.c --- a/fs/ext4/ioctl.c~linux-next-git-rejects +++ a/fs/ext4/ioctl.c @@ -257,10 +257,6 @@ group_extend_out: err = ext4_move_extents(filp, donor_filp, me.orig_start, me.donor_start, me.len, &me.moved_len); mnt_drop_write_file(filp); -<<<<<<< HEAD - mnt_drop_write(filp->f_path.mnt); -======= ->>>>>>> linux-next/akpm-end if (copy_to_user((struct move_extent __user *)arg, &me, sizeof(me))) diff -puN fs/nfs/client.c~linux-next-git-rejects fs/nfs/client.c --- a/fs/nfs/client.c~linux-next-git-rejects +++ a/fs/nfs/client.c @@ -84,11 +84,7 @@ retry: /* * Turn off NFSv4 uid/gid mapping when using AUTH_SYS */ -<<<<<<< HEAD -static int nfs4_disable_idmapping = 1; -======= static bool nfs4_disable_idmapping = 1; ->>>>>>> linux-next/akpm-end /* * RPC cruft for NFS _ 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 fs-nfs-nfs4procc-fix-printk-warnings.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs.patch drivers-platform-x86-sony-laptopc-fix-scancodes.patch drivers-scsi-mpt2sas-mpt2sas_scsihc-spell-primitive-correctly.patch drivers-scsi-megaraidc-fix-sparse-warnings-checkpatch-fixes.patch drivers-usb-misc-emi26c-emi62c-fix-warnings.patch mm.patch mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch drivers-idle-intel_idlec-remove-redundant-local_irq_disable-call.patch treewide-convert-uses-of-attrib_noreturn-to-__noreturn-checkpatch-fixes.patch drivers-video-nvidia-nvidiac-fix-warning.patch mm-vmscan-distinguish-between-memcg-triggering-reclaim-and-memcg-being-scanned-checkpatch-fixes.patch memcg-make-mem_cgroup_split_huge_fixup-more-efficient-fix.patch memcg-clear-pc-mem_cgorup-if-necessary-fix.patch memcg-clear-pc-mem_cgorup-if-necessary-fix-2-fix.patch memcg-simplify-lru-handling-by-new-rule-fix.patch memcg-simplify-lru-handling-by-new-rule-memcg-return-eintr-at-bypassing-try_charge-fix.patch mm-compaction-introduce-sync-light-migration-for-use-by-compaction-fix-fix.patch mm-compaction-introduce-sync-light-migration-for-use-by-compaction-fix-fix-3.patch mm-vmallocc-eliminate-extra-loop-in-pcpu_get_vm_areas-error-path-fix.patch kexec-remove-kmsg_dump_kexec.patch panic-dont-print-redundant-backtraces-on-oops-fix.patch drivers-parport-parport_pcc-fix-warnings.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 selftests-new-very-basic-kernel-selftests-directory.patch c-r-procfs-add-start_data-end_data-start_brk-members-to-proc-pid-stat-v4-fix.patch c-r-prctl-add-pr_set_mm-codes-to-set-up-mm_struct-entries-fix.patch fixed-use-of-rounddown_pow_of_two-in-ramoops.patch notify_change-check-that-i_mutex-is-held.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch