Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs updates from Al Viro:
 "Assorted bits and pieces"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  aio: drop needless assignment in aio_read()
  clean overflow checks in count_mounts() a bit
  seq_file: fix NULL pointer arithmetic warning
  uml/x86: use x86 load_unaligned_zeropad()
  asm/user.h: killed unused macros
  constify struct path argument of finish_automount()/do_add_mount()
  fs: Remove FIXME comment in generic_write_checks()

diff --cc arch/um/include/asm/Kbuild
Simple merge

diff --cc arch/x86/um/Kconfig
index ead7e5b3a97573defc132f412bbacc5090dcb1ee,4eb47d3ba6250e1e1af785085b2ccd157702b5c8..1bcd42c5303940c482002c6ddcf75fa6d8270915
--- 1/arch/x86/um/Kconfig
--- 2/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@@ -8,7 -8,7 +8,8 @@@ endmen
  
  config UML_X86
        def_bool y
 +      select ARCH_BINFMT_ELF_EXTRA_PHDRS if X86_32
+       select DCACHE_WORD_ACCESS
  
  config 64BIT
        bool "64-bit kernel" if "$(SUBARCH)" = "x86"

diff --cc fs/aio.c
Simple merge

diff --cc fs/internal.h
Simple merge

diff --cc fs/kernfs/file.c
Simple merge

diff --cc fs/namespace.c
Simple merge

diff --cc fs/read_write.c
index dc5000173b80a2e36d576df7afb49706e44c0a92,0173dc7183c9dfeda5a09fcf329ca47dcc0ca09d..e643aec2b0efe929bce63d6b4d1ddcf81b0b0399
--- 1/fs/read_write.c
--- 2/fs/read_write.c
+++ b/fs/read_write.c
@@@ -1627,10 -1634,9 +1627,9 @@@ int generic_write_checks_count(struct k
        if (IS_SWAPFILE(inode))
                return -ETXTBSY;
  
 -      if (!iov_iter_count(from))
 +      if (!*count)
                return 0;
  
-       /* FIXME: this is for backwards compatibility with 2.4 */
        if (iocb->ki_flags & IOCB_APPEND)
                iocb->ki_pos = i_size_read(inode);