The patch titled fcntl: Use consistent values for F_[GS]ETOWN_EX has been removed from the -mm tree. Its filename was fcntl-use-consistent-values-for-f_etown_ex.patch This patch was dropped because other changes were merged, which wrecked this patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fcntl: Use consistent values for F_[GS]ETOWN_EX From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> These values were only introduced during this release cycle, so it is still early enough to get them right. alpha uses the same values that are in asm-generic/fcntl.h, so just remove them. parisc uses the values interchanged for no apparent reason, so remove them to give us consistency across all architectures. Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Cc: "Joseph S. Myers" <joseph@xxxxxxxxxxxxxxxx> Cc: Oleg Nesterov <onestero@xxxxxxxxxx> Cc: Stephane Eranian <eranian@xxxxxxxxxxxxxx> Cc: Michael Kerrisk <mtk.manpages@xxxxxxxxxxxxxx> Cc: Roland McGrath <roland@xxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Ulrich Drepper <drepper@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/alpha/include/asm/fcntl.h | 2 -- arch/parisc/include/asm/fcntl.h | 2 -- include/asm-generic/fcntl.h | 2 -- 3 files changed, 6 deletions(-) diff -puN arch/alpha/include/asm/fcntl.h~fcntl-use-consistent-values-for-f_etown_ex arch/alpha/include/asm/fcntl.h --- a/arch/alpha/include/asm/fcntl.h~fcntl-use-consistent-values-for-f_etown_ex +++ a/arch/alpha/include/asm/fcntl.h @@ -26,8 +26,6 @@ #define F_GETOWN 6 /* for sockets. */ #define F_SETSIG 10 /* for sockets. */ #define F_GETSIG 11 /* for sockets. */ -#define F_SETOWN_EX 15 -#define F_GETOWN_EX 16 /* for posix fcntl() and lockf() */ #define F_RDLCK 1 diff -puN arch/parisc/include/asm/fcntl.h~fcntl-use-consistent-values-for-f_etown_ex arch/parisc/include/asm/fcntl.h --- a/arch/parisc/include/asm/fcntl.h~fcntl-use-consistent-values-for-f_etown_ex +++ a/arch/parisc/include/asm/fcntl.h @@ -28,8 +28,6 @@ #define F_SETOWN 12 /* for sockets. */ #define F_SETSIG 13 /* for sockets. */ #define F_GETSIG 14 /* for sockets. */ -#define F_GETOWN_EX 15 -#define F_SETOWN_EX 16 /* for posix fcntl() and lockf() */ #define F_RDLCK 01 diff -puN include/asm-generic/fcntl.h~fcntl-use-consistent-values-for-f_etown_ex include/asm-generic/fcntl.h --- a/include/asm-generic/fcntl.h~fcntl-use-consistent-values-for-f_etown_ex +++ a/include/asm-generic/fcntl.h @@ -82,10 +82,8 @@ #endif #endif -#ifndef F_SETOWN_EX #define F_SETOWN_EX 15 #define F_GETOWN_EX 16 -#endif #define F_OWNER_TID 0 #define F_OWNER_PID 1 _ Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are origin.patch fcntl-use-consistent-values-for-f_etown_ex.patch linux-next.patch x86-cpufreq-dont-use-acpi_processor_get_bios_limit-when-not-available.patch scsi-add-__init-__exit-macros-to-ibmvstgtc.patch m68k-dont-export-static-inline-functions.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