linux/drivers/usb/gadget
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
..
acm_ms.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
amd5536udc.c usb: gadget: remove global variable composite in composite.c 2012-09-10 15:35:41 +03:00
amd5536udc.h
at91_udc.c Merge 3.6-rc6 into usb-next 2012-09-16 20:42:46 -07:00
at91_udc.h
atmel_usba_udc.c
atmel_usba_udc.h
audio.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
bcm63xx_udc.c usb: gadget: bcm63xx UDC driver 2012-09-05 15:39:41 +03:00
cdc2.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
composite.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
config.c usb: gadget: libcomposite: move config.c into libcomposite 2012-09-10 15:36:16 +03:00
dbgp.c usb: gadget: libcomposite: add epautoconf.c to libcomposite 2012-09-10 15:37:51 +03:00
dummy_hcd.c Merge 3.6-rc6 into usb-next 2012-09-16 20:42:46 -07:00
epautoconf.c usb: gadget: libcomposite: add epautoconf.c to libcomposite 2012-09-10 15:37:51 +03:00
ether.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
f_acm.c
f_ecm.c usb: gadget: use %pm to print mac addresses 2012-08-23 11:04:20 +03:00
f_eem.c
f_fs.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
f_hid.c usb: gadget: libcomposite: move composite.c into libcomposite 2012-09-10 16:13:03 +03:00
f_loopback.c
f_mass_storage.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
f_midi.c usb: gadget: Provide a default implementation of default manufacturer string 2012-09-10 16:13:02 +03:00
f_ncm.c usb: gadget: use %pm to print mac addresses 2012-08-23 11:04:20 +03:00
f_obex.c
f_phonet.c netvm: propagate page->pfmemalloc from skb_alloc_page to skb 2012-07-31 18:42:46 -07:00
f_rndis.c
f_serial.c
f_sourcesink.c usb: gadget: move USB_BUFSIZ into global composite.h 2012-09-10 16:00:01 +03:00
f_subset.c usb: gadget: use %pm to print mac addresses 2012-08-23 11:04:20 +03:00
f_uac1.c
f_uac2.c usb: gadget: remove __devexit in f_uac2 2012-09-10 15:34:14 +03:00
f_uvc.c
f_uvc.h
file_storage.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
fsl_mxc_udc.c
fsl_qe_udc.c
fsl_qe_udc.h
fsl_udc_core.c usb: gadget: remove global variable composite in composite.c 2012-09-10 15:35:41 +03:00
fsl_usb2_udc.h
fusb300_udc.c usb: gadget: remove global variable composite in composite.c 2012-09-10 15:35:41 +03:00
fusb300_udc.h
g_ffs.c usb: gadget: libcomposite: move composite.c into libcomposite 2012-09-10 16:13:03 +03:00
g_zero.h
gadget_chips.h usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
gmidi.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
goku_udc.c usb: gadget: remove global variable composite in composite.c 2012-09-10 15:35:41 +03:00
goku_udc.h
hid.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
imx_udc.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
imx_udc.h
inode.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace 2012-10-02 11:11:09 -07:00
Kconfig USB: remove CONFIG_EXPERIMENTAL dependancies 2012-09-17 23:00:15 -07:00
lpc32xx_udc.c drivers/usb/gadget/lpc32xx_udc.c: adjust inconsistent IS_ERR and PTR_ERR 2012-09-05 16:52:09 -07:00
m66592-udc.c usb: gadget: remove global variable composite in composite.c 2012-09-10 15:35:41 +03:00
m66592-udc.h gadget/m66592: remove conditional compilation of clk code 2012-07-30 17:25:12 -07:00
Makefile usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
mass_storage.c usb: gadget: libcomposite: move composite.c into libcomposite 2012-09-10 16:13:03 +03:00
multi.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
mv_u3d.h
mv_u3d_core.c
mv_udc.h
mv_udc_core.c usb: gadget: remove global variable composite in composite.c 2012-09-10 15:35:41 +03:00
ncm.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
ndis.h
net2272.c
net2272.h
net2280.c
net2280.h
nokia.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
omap_udc.c usb: gadget: remove global variable composite in composite.c 2012-09-10 15:35:41 +03:00
omap_udc.h
pch_udc.c usb: gadget: remove global variable composite in composite.c 2012-09-10 15:35:41 +03:00
printer.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00
pxa25x_udc.c usb: gadget: remove global variable composite in composite.c 2012-09-10 15:35:41 +03:00
pxa25x_udc.h usb: gadget: pxa25x: make it compile with debug again 2012-09-10 15:35:58 +03:00
pxa27x_udc.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
pxa27x_udc.h
r8a66597-udc.c gadget/r8a66597: remove conditional compilation of clk code 2012-07-30 17:25:12 -07:00
r8a66597-udc.h gadget/r8a66597: remove conditional compilation of clk code 2012-07-30 17:25:12 -07:00
rndis.c usb: gadget: use native print_hex_dump_bytes() 2012-08-23 11:04:18 +03:00
rndis.h
s3c-hsotg.c usb: gadget: patches for v3.7 merge window 2012-09-11 13:39:49 -07:00
s3c-hsotg.h
s3c-hsudc.c usb: gadget: s3c-hsudc: Replace 0 with NULL for pointers 2012-09-03 17:09:37 +03:00
s3c2410_udc.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
s3c2410_udc.h
serial.c usb: gadget serial: don't shift bcd version left by 16 2012-09-10 20:04:20 +03:00
storage_common.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2012-08-01 10:26:23 -07:00
tcm_usb_gadget.c usb: gadget: libcomposite: move composite.c into libcomposite 2012-09-10 16:13:03 +03:00
tcm_usb_gadget.h usb: gadget: make sure each gadget is using same index for Product, Serial,… 2012-09-10 16:13:00 +03:00
u_ether.c Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2012-10-02 09:54:49 -07:00
u_ether.h
u_phonet.h
u_serial.c ARM: tegra: switch to dmaengine 2012-09-20 19:57:38 -07:00
u_serial.h
u_uac1.c gadgetfs: clean up 2012-07-29 21:24:21 +04:00
u_uac1.h
udc-core.c usb: gadget: remove global variable composite in composite.c 2012-09-10 15:35:41 +03:00
usbstring.c usb: gadget: libcomposite: move MODULE_VERSION to composite.c 2012-09-10 16:13:03 +03:00
uvc.h
uvc_queue.c
uvc_queue.h
uvc_v4l2.c
uvc_video.c
webcam.c usb: gadget: libcomposite: move composite.c into libcomposite 2012-09-10 16:13:03 +03:00
zero.c usb: gadget: remove usb_gadget_controller_number() 2012-09-10 16:43:24 +03:00