David Drysdale 75069f2b5b vfs: renumber FMODE_NONOTIFY and add to uniqueness check ... Fix clashing values for O_PATH and FMODE_NONOTIFY on sparc. The clashing O_PATH value was added in commit 5229645bdc ("vfs: add nonconflicting values for O_PATH") but this can't be changed as it is user-visible. FMODE_NONOTIFY is only used internally in the kernel, but it is in the same numbering space as the other O_* flags, as indicated by the comment at the top of include/uapi/asm-generic/fcntl.h (and its use in fs/notify/fanotify/fanotify_user.c). So renumber it to avoid the clash. All of this has happened before (commit 12ed2e36c9: "fanotify: FMODE_NONOTIFY and __O_SYNC in sparc conflict"), and all of this will happen again -- so update the uniqueness check in fcntl_init() to include __FMODE_NONOTIFY. Signed-off-by: David Drysdale <drysdale@google.com> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Jan Kara <jack@suse.cz> Cc: Heinrich Schuchardt <xypron.glpk@gmx.de> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Eric Paris <eparis@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2015-01-08 15:10:52 -08:00
..
acpi	Merge branches 'acpi-scan', 'acpi-utils' and 'acpi-pm'	2014-12-18 18:42:56 +01:00
asm-generic	ARM: SoC/iommu configuration for 3.19	2014-12-16 14:53:01 -08:00
clocksource
crypto
drm	Revert "drm/gem: Warn on illegal use of the dumb buffer interface v2"	2014-12-24 13:13:22 +10:00
dt-bindings	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc	2014-12-21 22:49:12 +08:00
keys
kvm	arm/arm64: KVM: Require in-kernel vgic for the arch timers	2014-12-15 11:50:42 +01:00
linux	vfs: renumber FMODE_NONOTIFY and add to uniqueness check	2015-01-08 15:10:52 -08:00
math-emu
media
memory
misc
net	Here's just a single fix - a revert of a patch that broke the	2015-01-06 13:29:27 -05:00
pcmcia
ras
rdma	IB/core: Implement support for MMU notifiers regarding on demand paging regions	2014-12-15 18:13:36 -08:00
rxrpc
scsi	SCSI for-linus on 20141220	2014-12-20 13:42:57 -08:00
soc
sound	ALSA: pcm: Fix kerneldoc for params_*() functions	2014-12-30 16:41:11 +01:00
target	SCSI for-linus on 20141220	2014-12-20 13:42:57 -08:00
trace	SCSI for-linus on 20141220	2014-12-20 13:42:57 -08:00
uapi	vfs: renumber FMODE_NONOTIFY and add to uniqueness check	2015-01-08 15:10:52 -08:00
video
xen
Kbuild