1
0
Fork 0
alistair23-linux/drivers/staging/android/ion
Linus Torvalds 77c688ac87 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs updates from Al Viro:
 "The big thing in this pile is Eric's unmount-on-rmdir series; we
  finally have everything we need for that.  The final piece of prereqs
  is delayed mntput() - now filesystem shutdown always happens on
  shallow stack.

  Other than that, we have several new primitives for iov_iter (Matt
  Wilcox, culled from his XIP-related series) pushing the conversion to
  ->read_iter()/ ->write_iter() a bit more, a bunch of fs/dcache.c
  cleanups and fixes (including the external name refcounting, which
  gives consistent behaviour of d_move() wrt procfs symlinks for long
  and short names alike) and assorted cleanups and fixes all over the
  place.

  This is just the first pile; there's a lot of stuff from various
  people that ought to go in this window.  Starting with
  unionmount/overlayfs mess...  ;-/"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (60 commits)
  fs/file_table.c: Update alloc_file() comment
  vfs: Deduplicate code shared by xattr system calls operating on paths
  reiserfs: remove pointless forward declaration of struct nameidata
  don't need that forward declaration of struct nameidata in dcache.h anymore
  take dname_external() into fs/dcache.c
  let path_init() failures treated the same way as subsequent link_path_walk()
  fix misuses of f_count() in ppp and netlink
  ncpfs: use list_for_each_entry() for d_subdirs walk
  vfs: move getname() from callers to do_mount()
  gfs2_atomic_open(): skip lookups on hashed dentry
  [infiniband] remove pointless assignments
  gadgetfs: saner API for gadgetfs_create_file()
  f_fs: saner API for ffs_sb_create_file()
  jfs: don't hash direct inode
  [s390] remove pointless assignment of ->f_op in vmlogrdr ->open()
  ecryptfs: ->f_op is never NULL
  android: ->f_op is never NULL
  nouveau: __iomem misannotations
  missing annotation in fs/file.c
  fs: namespace: suppress 'may be used uninitialized' warnings
  ...
2014-10-13 11:28:42 +02:00
..
tegra staging:android: Introduce the use of the managed version of kzalloc 2014-03-07 15:36:48 -08:00
Kconfig staging: ion: vm_insert_pfn and zap_page_range rely on CONFIG_MMU 2014-07-30 16:36:27 -07:00
Makefile ion: Add dummy driver for testing 2014-01-09 21:16:40 -08:00
compat_ion.c android: ->f_op is never NULL 2014-10-09 02:39:12 -04:00
compat_ion.h ion: add compat_ioctl 2013-12-14 08:57:18 -08:00
ion.c staging: android: ion: Remove redundant return of void function 2014-08-16 12:23:23 -07:00
ion.h staging: ion: Remove left over comment 2014-07-17 18:07:30 -07:00
ion_carveout_heap.c staging: android: ion: Remove redundant return of void function 2014-08-16 12:23:23 -07:00
ion_chunk_heap.c staging: android: ion: Remove redundant return of void function 2014-08-16 12:23:23 -07:00
ion_cma_heap.c staging: android: ion: ion_cma_heap.c: Fix checkpatch warning 2014-07-21 12:26:55 -07:00
ion_dummy_driver.c staging: android: ion: Remove redundant return of void function 2014-08-16 12:23:23 -07:00
ion_heap.c staging: android: fix missing a blank line after declarations 2014-05-03 19:46:30 -04:00
ion_page_pool.c staging: ion: shrink highmem pages on kswapd 2014-05-29 13:40:46 -07:00
ion_priv.h staging: ion: tidy up a bit 2014-05-29 13:40:33 -07:00
ion_system_heap.c staging: android: ion: Remove redundant return of void function 2014-08-16 12:23:23 -07:00
ion_test.c ion_test: Add compat_ioctl support (v2) 2013-12-19 16:10:25 -08:00