kernel-ark/arch/um/drivers
Linus Torvalds aab174f0df Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs update from Al Viro:

 - big one - consolidation of descriptor-related logics; almost all of
   that is moved to fs/file.c

   (BTW, I'm seriously tempted to rename the result to fd.c.  As it is,
   we have a situation when file_table.c is about handling of struct
   file and file.c is about handling of descriptor tables; the reasons
   are historical - file_table.c used to be about a static array of
   struct file we used to have way back).

   A lot of stray ends got cleaned up and converted to saner primitives,
   disgusting mess in android/binder.c is still disgusting, but at least
   doesn't poke so much in descriptor table guts anymore.  A bunch of
   relatively minor races got fixed in process, plus an ext4 struct file
   leak.

 - related thing - fget_light() partially unuglified; see fdget() in
   there (and yes, it generates the code as good as we used to have).

 - also related - bits of Cyrill's procfs stuff that got entangled into
   that work; _not_ all of it, just the initial move to fs/proc/fd.c and
   switch of fdinfo to seq_file.

 - Alex's fs/coredump.c spiltoff - the same story, had been easier to
   take that commit than mess with conflicts.  The rest is a separate
   pile, this was just a mechanical code movement.

 - a few misc patches all over the place.  Not all for this cycle,
   there'll be more (and quite a few currently sit in akpm's tree)."

Fix up trivial conflicts in the android binder driver, and some fairly
simple conflicts due to two different changes to the sock_alloc_file()
interface ("take descriptor handling from sock_alloc_file() to callers"
vs "net: Providing protocol type via system.sockprotoname xattr of
/proc/PID/fd entries" adding a dentry name to the socket)

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (72 commits)
  MAX_LFS_FILESIZE should be a loff_t
  compat: fs: Generic compat_sys_sendfile implementation
  fs: push rcu_barrier() from deactivate_locked_super() to filesystems
  btrfs: reada_extent doesn't need kref for refcount
  coredump: move core dump functionality into its own file
  coredump: prevent double-free on an error path in core dumper
  usb/gadget: fix misannotations
  fcntl: fix misannotations
  ceph: don't abuse d_delete() on failure exits
  hypfs: ->d_parent is never NULL or negative
  vfs: delete surplus inode NULL check
  switch simple cases of fget_light to fdget
  new helpers: fdget()/fdput()
  switch o2hb_region_dev_write() to fget_light()
  proc_map_files_readdir(): don't bother with grabbing files
  make get_file() return its argument
  vhost_set_vring(): turn pollstart/pollstop into bool
  switch prctl_set_mm_exe_file() to fget_light()
  switch xfs_find_handle() to fget_light()
  switch xfs_swapext() to fget_light()
  ...
2012-10-02 20:25:04 -07:00
..
chan_kern.c TTY: um/line, use tty from tty_port 2012-07-28 17:47:58 +02:00
chan_user.c um: take register_winch_irq() into the caller of is_skas_winch() 2011-11-02 14:15:11 +01:00
chan_user.h um: chan_init_pri is dead now 2012-03-25 00:29:54 +01:00
chan.h um: switch close_chan() to struct line 2012-03-25 00:29:54 +01:00
cow_sys.h um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
cow_user.c um: switch cow_user.h to htobe{32,64}/betoh{32,64} 2012-04-10 00:13:45 +02:00
cow.h um: switch cow_user.h to htobe{32,64}/betoh{32,64} 2012-04-10 00:13:45 +02:00
daemon_kern.c um: Kill directly reference of netdev->priv 2008-12-04 15:07:33 -08:00
daemon_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
daemon.h
fd.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
harddog_kern.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
harddog_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
hostaudio_kern.c Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:43:11 -07:00
line.c TTY: use tty_port_register_device 2012-08-13 16:50:19 -07:00
line.h um: remove count_lock 2012-07-28 17:47:59 +02:00
Makefile um: add ucast ethernet transport 2011-05-25 08:39:41 -07:00
mconsole_kern.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2012-10-02 20:25:04 -07:00
mconsole_kern.h um: take mconsole*.h to arch/um/drivers 2011-11-02 14:15:12 +01:00
mconsole_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
mconsole.h um: take mconsole*.h to arch/um/drivers 2011-11-02 14:15:12 +01:00
mmapper_kern.c treewide: remove extra semicolons 2011-04-10 17:01:05 +02:00
net_kern.c arch: Use eth_random_addr 2012-07-16 22:39:25 -07:00
net_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
null.c
pcap_kern.c um: Kill directly reference of netdev->priv 2008-12-04 15:07:33 -08:00
pcap_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
pcap_user.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
port_kern.c um: remove IRQF_SAMPLE_RANDOM which is now a no-op 2012-07-19 10:40:42 -04:00
port_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
port.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
pty.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
random.c um: remove IRQF_SAMPLE_RANDOM which is now a no-op 2012-07-19 10:40:42 -04:00
slip_common.c
slip_common.h
slip_kern.c UML: Fix some apparent bitrot 2009-06-25 11:22:13 -07:00
slip_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
slip.h
slirp_kern.c UML: Fix some apparent bitrot 2009-06-25 11:22:13 -07:00
slirp_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
slirp.h
ssl.c um: fully use tty_port 2012-07-28 17:47:59 +02:00
ssl.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
stderr_console.c
stdio_console.c um: fully use tty_port 2012-07-28 17:47:59 +02:00
stdio_console.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
tty.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
ubd_kern.c um: fix ubd_file_size for read-only files 2012-08-02 00:44:49 +02:00
ubd_user.c um: clean up the includes in ubd 2012-03-25 00:29:52 +01:00
ubd.h um: clean up the includes in ubd 2012-03-25 00:29:52 +01:00
umcast_kern.c um: add ucast ethernet transport 2011-05-25 08:39:41 -07:00
umcast_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
umcast.h um: add ucast ethernet transport 2011-05-25 08:39:41 -07:00
vde_kern.c um: Kill directly reference of netdev->priv 2008-12-04 15:07:33 -08:00
vde_user.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
vde.h
xterm_kern.c um: remove IRQF_SAMPLE_RANDOM which is now a no-op 2012-07-19 10:40:42 -04:00
xterm.c um: -include user.h for USER_OBJ, trim includes 2011-11-02 14:14:44 +01:00
xterm.h uml: remove useless comments 2009-04-01 08:59:17 -07:00