dect
/
linux-2.6
Archived
13
0
Fork 0
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/drivers/staging
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
..
android Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2012-10-02 20:25:04 -07:00
asus_oled Staging: asus_oled: Add suspend/resume callbacks 2012-09-04 13:12:13 -07:00
bcm Staging: bcm: Remove typedef for _stCPacketClassificationRuleSI and call directly. 2012-09-26 09:31:52 -07:00
ccg 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
ced1401 staging:ced1401: remove read write callbacks from fops 2012-09-21 08:56:41 -07:00
comedi staging: comedi: jr3_pci: fix iomem dereference 2012-09-27 10:06:36 -07:00
cptm1217 staging: cptm1217: use module_i2c_driver macro 2012-09-04 14:23:33 -07:00
crystalhd drivers/staging/crystalhd/crystalhd_lnx.c: adjust inconsistent IS_ERR and PTR_ERR 2012-09-04 14:22:48 -07:00
csr staging: Fix spelling of "asynchronous" in comments. 2012-09-21 08:56:41 -07:00
cxt1e1 staging: cxt1e1: solve coding style problem 2012-09-04 14:27:42 -07:00
dgrp staging: dgrp: using vmalloc needs to include vmalloc.h 2012-09-25 15:44:56 -07:00
echo
et131x Staging tree update for 3.7-rc1 2012-10-01 12:11:39 -07:00
frontier
ft1000 staging: ft1000: replace c99 comments with c88 2012-09-17 05:31:32 -07:00
gdm72xx Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-10-02 13:38:27 -07:00
iio staging:iio:dummy: Fix potential NULL pointer dereference 2012-09-22 10:55:08 +01:00
imx-drm staging: drm/imx: Add TODO 2012-09-21 09:17:07 -07:00
ipack TTY merge for 3.7-rc1 2012-10-01 12:26:52 -07:00
keucr USB merge for 3.7-rc1 2012-10-01 13:23:01 -07:00
line6
media
net
nvec 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
octeon
olpc_dcon staging/olpc_dcon: fix checkpatch warnings 2012-08-17 09:45:37 -07:00
omap-thermal staging: omap-thermal: bandgap: fix setting of alert thresholds 2012-09-21 08:56:40 -07:00
omapdrm Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2012-10-02 20:25:04 -07:00
ozwpan staging: ozwpan: compare pointer to NULL rather than 0 2012-09-19 09:28:14 +01:00
panel staging: Fix misspellings of "whether". 2012-09-21 08:56:40 -07:00
phison
quickstart
ramster staging: ramster: fix build warnings 2012-09-07 22:05:03 -07:00
rtl8187se staging: rtl8187se: using random_ether_addr() to generate random MAC 2012-09-04 14:10:08 -07:00
rtl8192e Staging tree update for 3.7-rc1 2012-10-01 12:11:39 -07:00
rtl8192u staging: Fix misspellings of "whether". 2012-09-21 08:56:40 -07:00
rtl8712 staging: r8712u: Do not queue cloned skb 2012-09-26 13:05:50 -07:00
rts5139 staging: rts5139: use kzalloc() to close an info leak 2012-09-26 09:19:50 -07:00
rts_pstor staging/rts_pstor: Delete some lines (dev_info() and dev_err()) in rtsx.c 2012-09-21 08:56:41 -07:00
sbe-2t3e3 staging: sbe-2t3e3: fix error handling in t3e3_init_channel() 2012-09-25 15:48:25 -07:00
sep Staging: sep: Correct misspelled "remap_page_range" -> "remap_pfn_range" 2012-09-04 14:27:41 -07:00
serqt_usb2 USB merge for 3.7-rc1 2012-10-01 13:23:01 -07:00
silicom staging: fix silicom dependencies and build errors 2012-09-21 08:56:40 -07:00
slicoss staging: slicoss: fix a null deref when pci_alloc_consistent fail 2012-09-05 11:59:51 -07:00
sm7xxfb staging: sm7xxfb: remove smtc_VRAMBaseAddress 2012-09-17 14:57:53 -07:00
speakup TTY merge for 3.7-rc1 2012-10-01 12:26:52 -07:00
ste_rmi4 staging: ste_rmi4: remove gpio.h include 2012-09-14 09:21:56 -05:00
telephony staging: Fix spelling of "asynchronous" in comments. 2012-09-21 08:56:41 -07:00
tidspbridge ARM: soc: general cleanups 2012-10-01 18:19:05 -07:00
usbip USB merge for 3.7-rc1 2012-10-01 13:23:01 -07:00
vme staging/vme: Use pr_ printks in vme_pio2_core.c 2012-09-04 13:22:48 -07:00
vt6655 staging: vt6655: vt6655_init_info function must be void type 2012-09-07 22:07:37 -07:00
vt6656 Merge 3.6-rc6 into staging-next 2012-09-16 17:17:25 -07:00
winbond Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-10-02 13:38:27 -07:00
wlags49_h2 staging: "wlags49_h2" Fix typos. 2012-09-10 20:24:01 -07:00
wlags49_h25 staging: "wlags49_h25" Fix typos. 2012-09-17 14:50:33 -07:00
wlan-ng staging "wlan-ng" Fix typos. 2012-09-26 09:19:50 -07:00
xgifb staging: xgifb: delete bogus video RAM configuration 2012-09-13 20:41:57 -07:00
zcache Merge 3.6-rc6 into staging-next 2012-09-16 17:17:25 -07:00
zram
zsmalloc
Kconfig TTY merge for 3.7-rc1 2012-10-01 12:26:52 -07:00
Makefile TTY merge for 3.7-rc1 2012-10-01 12:26:52 -07:00
staging.c