1
0
Fork 0
alistair23-linux/drivers/staging
Linus Torvalds 9bf12df31f Merge git://git.kvack.org/~bcrl/aio-next
Pull aio changes from Ben LaHaise:
 "First off, sorry for this pull request being late in the merge window.
  Al had raised a couple of concerns about 2 items in the series below.
  I addressed the first issue (the race introduced by Gu's use of
  mm_populate()), but he has not provided any further details on how he
  wants to rework the anon_inode.c changes (which were sent out months
  ago but have yet to be commented on).

  The bulk of the changes have been sitting in the -next tree for a few
  months, with all the issues raised being addressed"

* git://git.kvack.org/~bcrl/aio-next: (22 commits)
  aio: rcu_read_lock protection for new rcu_dereference calls
  aio: fix race in ring buffer page lookup introduced by page migration support
  aio: fix rcu sparse warnings introduced by ioctx table lookup patch
  aio: remove unnecessary debugging from aio_free_ring()
  aio: table lookup: verify ctx pointer
  staging/lustre: kiocb->ki_left is removed
  aio: fix error handling and rcu usage in "convert the ioctx list to table lookup v3"
  aio: be defensive to ensure request batching is non-zero instead of BUG_ON()
  aio: convert the ioctx list to table lookup v3
  aio: double aio_max_nr in calculations
  aio: Kill ki_dtor
  aio: Kill ki_users
  aio: Kill unneeded kiocb members
  aio: Kill aio_rw_vect_retry()
  aio: Don't use ctx->tail unnecessarily
  aio: io_cancel() no longer returns the io_event
  aio: percpu ioctx refcount
  aio: percpu reqs_available
  aio: reqs_active -> reqs_available
  aio: fix build when migration is disabled
  ...
2013-09-13 10:55:58 -07:00
..
android Merge git://git.kvack.org/~bcrl/aio-next 2013-09-13 10:55:58 -07:00
bcm Staging:BCM:DDRInit.c:Renaming __FUNCTION__ 2013-08-30 11:49:04 -07:00
btmtk_usb
ced1401
comedi TTY/Serial driver patches for 3.12-rc1 2013-09-03 11:38:36 -07:00
cptm1217
crystalhd staging: crystalhd: Resolve sparse 'different base types' warnings. 2013-08-30 11:46:46 -07:00
cxt1e1 staging: cxt1e1: Remove #define SBE_INCLUDE_SYMBOLS 2013-08-12 15:20:25 -07:00
dgap staging: dgap: Add missing #include <linux/slab.h> 2013-08-30 11:30:58 -07:00
dgnc staging: dgnc: adds TODO 2013-08-30 11:28:58 -07:00
dgrp TTY/Serial driver patches for 3.12-rc1 2013-09-03 11:38:36 -07:00
dwc2 staging: dwc2: make dwc2_core_params documentation more complete 2013-08-30 14:14:54 -07:00
echo
et131x staging: et131x: Remove frame error TODO item 2013-08-21 10:02:28 -07:00
frontier staging: frontier: use better DEVICE_ATTR_ macros 2013-08-24 10:30:28 -07:00
ft1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2013-07-09 18:24:39 -07:00
fwserial IEEE 1394 (FireWire) subsystem changes post v3.10: 2013-07-10 11:02:58 -07:00
gdm72xx staging: gdm72xx: potential use after free in send_qos_list() 2013-07-23 15:08:50 -07:00
gdm724x staging: gdm724x: Remove version.h header inclusion in netlink_k.c 2013-08-27 22:53:22 -07:00
goldfish
iio staging: iio: ad7746: Use devm_iio_device_alloc 2013-08-28 20:21:34 +01:00
imx-drm Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2013-09-05 10:17:26 -07:00
keucr staging: keucr: be explicit to the sysfs file permissions 2013-08-24 10:33:07 -07:00
line6 staging: line6: use default sysfs attribute macros 2013-08-24 10:36:49 -07:00
lustre Merge git://git.kvack.org/~bcrl/aio-next 2013-09-13 10:55:58 -07:00
media [media] msi3101: Fix compilation on i386 2013-08-24 13:35:14 -03:00
netlogic staging: netlogic: Fix typo in staging/netlogic 2013-06-24 15:56:09 -07:00
nvec staging: nvec: re-enable the clock on resume 2013-07-29 11:29:37 -07:00
octeon
octeon-usb staging: octeon-usb: eliminate remaining typedef unions 2013-07-31 17:51:50 -07:00
olpc_dcon Staging: olpc_dcon: Removed more completed TODO entries 2013-08-21 10:02:28 -07:00
ozwpan staging: ozwpan: Return error, if PD is not connected. 2013-08-28 15:18:40 -07:00
panel
phison
quickstart staging: quickstart: fix up sysfs file permissions 2013-08-24 10:34:53 -07:00
rtl8187se staging: Update e-mail address for Andrea Merello 2013-08-27 22:03:53 -07:00
rtl8188eu staging: rtl8188eu: off by one in rtw_set_802_11_add_wep() 2013-08-30 11:46:47 -07:00
rtl8192e staging: Update e-mail address for Andrea Merello 2013-08-27 22:03:53 -07:00
rtl8192u staging: Update e-mail address for Andrea Merello 2013-08-27 22:03:53 -07:00
rtl8712 staging: rtl8712: return MAC in standard form 2013-07-23 14:52:19 -07:00
rts5139
sb105x
sbe-2t3e3
sep
serqt_usb2 Staging tree merge for 3.11-rc1 2013-07-02 11:40:23 -07:00
silicom Staging: silicom: Remove useless unneeded semicolons 2013-07-23 14:42:56 -07:00
slicoss
sm7xxfb
speakup
ste_rmi4
tidspbridge staging: tidspbridge: Fix typos in comments 2013-08-21 10:02:28 -07:00
usbip staging: usbip: use DEVICE_ATTR_RO/RW for sysfs attributes 2013-08-26 12:02:54 -07:00
vme
vt6655 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2013-09-05 14:54:29 -07:00
vt6656 staging: vt6656: device.h Replace typedef struct _RCB 2013-08-28 15:28:43 -07:00
winbond Staging: winbond: mds_f: deleted extern function 2013-08-12 14:55:50 -07:00
wlags49_h2 staging: wlags49_h2: remove sysfs file 2013-08-24 10:24:40 -07:00
wlags49_h25 staging: wlags49_h2: remove sysfs file 2013-08-24 10:24:40 -07:00
wlan-ng
xgifb Staging: xgifb: Fixed a warning of Space before semicolon 2013-08-12 14:08:27 -07:00
xillybus staging: xillybus: Remove duplicate inclusion of list.h 2013-08-22 10:07:49 -07:00
zram zram: don't grab mutex in zram_slot_free_noity 2013-08-12 15:25:00 -07:00
zsmalloc staging: zsmalloc: access page->private by using page_private macro 2013-07-23 14:52:19 -07:00
Kconfig staging: dgap: adds driver to kernel build 2013-08-22 10:47:53 -07:00
Makefile staging: dgap: adds driver to kernel build 2013-08-22 10:47:53 -07:00
staging.c