The patch titled git-nfsd-fix has been added to the -mm tree. Its filename is git-nfsd-fix.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://www.zip.com.au/~akpm/linux/patches/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: git-nfsd-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> In file included from arch/ia64/ia32/sys_ia32.c:59: arch/ia64/ia32/ia32priv.h:297:1: warning: "elf_check_arch" redefined In file included from include/linux/elf.h:7, from include/linux/module.h:14, from include/linux/textsearch.h:9, from include/linux/skbuff.h:26, from include/linux/icmpv6.h:79, from include/linux/ipv6.h:197, from include/net/ipv6.h:18, from include/linux/sunrpc/svcauth.h:18, from include/linux/sunrpc/svc.h:18, from arch/ia64/ia32/sys_ia32.c:37: include/asm/elf.h:19:1: warning: this is the location of the previous definition In file included from arch/ia64/ia32/sys_ia32.c:59: Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx> Cc: Neil Brown <neilb@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/sunrpc/svcauth.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/sunrpc/svcauth.h~git-nfsd-fix include/linux/sunrpc/svcauth.h --- a/include/linux/sunrpc/svcauth.h~git-nfsd-fix +++ a/include/linux/sunrpc/svcauth.h @@ -15,7 +15,6 @@ #include <linux/sunrpc/msg_prot.h> #include <linux/sunrpc/cache.h> #include <linux/hash.h> -#include <net/ipv6.h> #define SVC_CRED_NGROUPS 32 struct svc_cred { @@ -25,6 +24,7 @@ struct svc_cred { }; struct svc_rqst; /* forward decl */ +struct in6_addr; /* Authentication is done in the context of a domain. * _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are revert-send-a-single-notification-on-device-state-changes.patch softlockup-workaround.patch git-acpi-powerpc-kconfig-fix.patch acpi-enable-c3-power-state-on-dell-inspiron-8200.patch git-audit-printk-warning-fix.patch git-cifs.patch drivers-pcmcia-i82092c-fix-up-after-pci_bus_region-changes.patch git-drm.patch git-dvb.patch git-dvb-someone-broke-the-gpio-includes.patch git-hwmon.patch adt7473-new-driver-for-analog-devices-adt7473-sensor-chip.patch drivers-input-touchscreen-ads7846c-fix-uninitialized-var-warning.patch git-kvm.patch fix-ide-mm-ide-rework-powermac-media-bay-support.patch git-md-accel.patch git-ubi.patch git-net.patch 3c509-convert-to-isa_driver-and-pnp_driver-v4-cleanup.patch update-smc91x-driver-with-arm-versatile-board-info.patch git-nfsd.patch git-nfsd-fix.patch cleanup-gregkh-pci-pci-fix-bus-resource-assignment-on-32-bits-with-64b-resources.patch quirks-set-en-bit-of-msi-mapping-for-devices-onht-based-nvidia-platform.patch git-sched.patch git-sched-git-rejects.patch tracing-is-borked-on-powerpc.patch scsi-aic94xx-cleanups.patch libsas-convert-ata-bridge-to-use-new-eh.patch git-block-git-rejects.patch git-sparc64.patch git-unionfs.patch git-unionfs-git-rejects.patch unionfs-is-broken.patch embed-a-struct-path-into-struct-nameidata-instead-of-nd-dentrymnt-vs-git-unionfs.patch drivers-usb-storage-sddr55c-fix-uninitialized-var-warnings.patch usb-ohci-sm501-driver-v2-fix.patch drivers-usb-serial-io_tic-remove-pointless-eye-candy-in-debug-statements.patch git-watchdog.patch git-watchdog-git-rejects.patch pci-dont-load-acpi_php-when-acpi-is-disabled.patch x86-amd-thermal-interrupt-support.patch git-xtensa.patch add-rcu_assign_index-if-ever-needed-fix.patch bluetooth-fix-warning-in-net-bluetooth-hci_sysfsc.patch remove-sparse-warning-for-mmzoneh-checkpatch-fixes.patch fix-invalidate_inode_pages2_range-to-not-clear-ret-checkpatch-fixes.patch vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch vm-dont-run-touch_buffer-during-buffercache-lookups.patch make-dev-kmem-a-config-option-fix.patch r-o-bind-mounts-elevate-write-count-for-callers-of-vfs_mkdir-fix.patch r-o-bind-mounts-elevate-write-count-for-xattr_permission-callers-fix.patch r-o-bind-mounts-get-write-access-for-vfs_rename-callers-fix.patch r-o-bind-mounts-check-mnt-instead-of-superblock-directly-fix.patch r-o-bind-mounts-check-mnt-instead-of-superblock-directly-fix-2.patch r-o-bind-mounts-get-callers-of-vfs_mknod-create-fix.patch inflate-refactor-inflate-malloc-code-checkpatch-fixes.patch oprofile-change-cpu_buffer-from-array-to-per_cpu-variable-checkpatch-fixes.patch rtc-add-support-for-the-s-35390a-rtc-chip-checkpatch-fixes.patch rtc-isl1208-new-style-conversion-and-minor-bug-fixes-checkpatch-fixes.patch rtc-pcf8563-new-style-conversion-checkpatch-fixes.patch rtc-pcf8563-new-style-conversion-checkpatch-fixes-fix.patch rtc-x1205-new-style-conversion-checkpatch-fixes.patch fb-add-support-for-foreign-endianness-force-it-on.patch ipc-use-ipc_buildid-directly-from-ipc_addid-cleanup.patch ipmi-run-to-completion-fixes-checkpatch-fixes.patch ipmi-style-fixes-in-the-system-interface-code-checkpatch-fixes.patch elf-fix-shadowed-variables-in-fs-binfmt_elfc.patch sgi-altix-mmtimer-allow-larger-number-of-timers-per-node-fix.patch procfs-task-exe-symlink-fix.patch reiser4.patch jens-broke-reiser4patch-added-to-mm-tree.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch profile-likely-unlikely-macros-fix.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 w1-build-fix.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html