The patch titled headers_check: reduce user-visible noise in <linux/nfs_fs.h> has been removed from the -mm tree. Its filename is headers_check-reduce-user-visible-noise-in-linux-nfs_fsh.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: headers_check: reduce user-visible noise in <linux/nfs_fs.h> From: David Woodhouse <dwmw2@xxxxxxxxxxxxx> We don't need any of this crap included from the user-visible part of nfs_fs.h -- remove it all. In fact, we probably don't need anything but NFS_SUPER_MAGIC to be defined; is there any need for anything else? And magic numbers should probably move to <linux/magic.h> rather than being strewn across various fs-specific include files which exist in userspace for solely that purpose. With this patch, 'make header_check' works again at least on PowerPC. Signed-off-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/linux/nfs_fs.h | 52 +++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff -puN include/linux/nfs_fs.h~headers_check-reduce-user-visible-noise-in-linux-nfs_fsh include/linux/nfs_fs.h --- a/include/linux/nfs_fs.h~headers_check-reduce-user-visible-noise-in-linux-nfs_fsh +++ a/include/linux/nfs_fs.h @@ -9,27 +9,6 @@ #ifndef _LINUX_NFS_FS_H #define _LINUX_NFS_FS_H -#include <linux/in.h> -#include <linux/mm.h> -#include <linux/pagemap.h> -#include <linux/rwsem.h> -#include <linux/wait.h> - -#include <linux/sunrpc/debug.h> -#include <linux/sunrpc/auth.h> -#include <linux/sunrpc/clnt.h> - -#include <linux/nfs.h> -#include <linux/nfs2.h> -#include <linux/nfs3.h> -#include <linux/nfs4.h> -#include <linux/nfs_xdr.h> - -#include <linux/nfs_fs_sb.h> - -#include <linux/rwsem.h> -#include <linux/mempool.h> - /* * Enable debugging support for nfs client. * Requires RPC_DEBUG. @@ -48,11 +27,6 @@ #define NFS_SUPER_MAGIC 0x6969 /* - * These are the default flags for swap requests - */ -#define NFS_RPC_SWAPFLAGS (RPC_TASK_SWAPPER|RPC_TASK_ROOTCREDS) - -/* * When flushing a cluster of dirty pages, there can be different * strategies: */ @@ -65,6 +39,32 @@ #ifdef __KERNEL__ +#include <linux/in.h> +#include <linux/mm.h> +#include <linux/pagemap.h> +#include <linux/rwsem.h> +#include <linux/wait.h> + +#include <linux/sunrpc/debug.h> +#include <linux/sunrpc/auth.h> +#include <linux/sunrpc/clnt.h> + +#include <linux/nfs.h> +#include <linux/nfs2.h> +#include <linux/nfs3.h> +#include <linux/nfs4.h> +#include <linux/nfs_xdr.h> + +#include <linux/nfs_fs_sb.h> + +#include <linux/rwsem.h> +#include <linux/mempool.h> + +/* + * These are the default flags for swap requests + */ +#define NFS_RPC_SWAPFLAGS (RPC_TASK_SWAPPER|RPC_TASK_ROOTCREDS) + /* * NFSv3/v4 Access mode cache entry */ _ Patches currently in -mm which might be from dwmw2@xxxxxxxxxxxxx are origin.patch fix-make-headers_check-on-biarch-architectures-for.patch fix-make-headers_check-on-s390-for-2618.patch fix-make-headers_check-on-ia64-for-2618.patch fix-make-headers_check-on-x86_64-for-2618.patch fix-make-headers_check-on-i386-for-2618.patch fix-make-headers_check-for-alpha-in-2618.patch headers_check-use-a-different-default-directory.patch mtd-nand-oob-buffer-offset-fixups.patch jffs2-summary-fix-a-summary-collecting-bug.patch arm-make-headers_check.patch git-gfs2.patch git-mtd.patch mtd-maps-ixp4xx-partition-parsing.patch fix-the-unlock-addr-lookup-bug-in-mtd-jedec-probe.patch mtd-printk-format-warning.patch fs-jffs2-jffs2_fs_ih-removal-of-old-code.patch drivers-mtd-nand-au1550ndc-removal-of-old-code.patch fix-make-headers_check-for-parisc-in-2618.patch pci-quirks-update.patch avr32-mtd-static-memory-controller-driver-try-2.patch avr32-mtd-unlock-flash-if-necessary-try-2.patch avr32-mtd-at49bv6416-platform-device-for-atstk1000.patch split-i386-and-x86_64-ptraceh.patch split-i386-and-x86_64-ptraceh-fix.patch make-uml-use-ptrace-abih.patch fs-conversions-from-kmallocmemset-to-kzcalloc.patch add-config_headers_check-option-to-automatically-run-make-headers_check.patch pci-mtd-switch-to-pci_get_device-and-do-ref-counting.patch the-scheduled-removal-of-some-oss-drivers-fix-fix.patch debug-shared-irqs.patch debug-shared-irqs-kconfig-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