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
for-linus-3.12-merge minor 9p fixes and tweaks for 3.12 merge window
2013-09-11 12:34:13 -07:00
net/802/mrp: fix lockdep splat
2013-05-14 13:02:30 -07:00
net: vlan: inherit addr_assign_type along with dev_addr
2013-09-03 20:57:49 -04:00
net: proc_fs: trivial: print UIDs as unsigned int
2013-08-15 14:37:46 -07:00
net: always pass struct netdev_notifier_info to netdevice notifiers
2013-05-28 21:58:54 -07:00
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
batman: Remove reference to compare_ether_addr
2013-09-03 22:34:48 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2013-09-06 09:30:36 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-09-05 14:54:29 -07:00
caif: Add missing braces to multiline if in cfctrl_linkup_request
2013-09-05 14:31:02 -04:00
can: gw: add a per rule limitation of frame hops
2013-08-29 22:58:24 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2013-09-09 09:13:22 -07:00
net: fix multiqueue selection
2013-09-11 16:10:00 -04:00
net: add sk_stream_is_writeable() helper
2013-07-24 17:54:48 -07:00
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
net: strict_strtoul is obsolete, use kstrtoul instead
2013-07-12 16:09:14 -07:00
net: dsa: inherit addr_assign_type along with dev_addr
2013-09-03 20:57:49 -04:00
net: Fix sysfs_format_mac() code duplication.
2013-07-16 17:09:22 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-09-05 14:54:29 -07:00
memcg: rename RESOURCE_MAX to RES_COUNTER_MAX
2013-09-12 15:38:02 -07:00
ipv6: don't call fib6_run_gc() until routing is ready
2013-09-11 17:04:09 -04:00
net: proc_fs: trivial: print UIDs as unsigned int
2013-08-15 14:37:46 -07:00
net/irda: fixed style issues in irttp
2013-07-19 17:34:40 -07:00
net: delete __cpuinit usage from all net files
2013-07-14 19:36:58 -04:00
xfrm: Remove rebundant address family checking
2013-08-07 10:12:58 +02:00
l2tp: make datapath resilient to packet loss when sequence numbers enabled
2013-07-02 16:33:25 -07:00
llc: Use normal etherdevice.h tests
2013-09-03 22:34:47 -04:00
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
2013-08-28 13:51:40 -04:00
MPLS: Add limited GSO support
2013-05-27 22:50:59 -07:00
netfilter: Fix build errors with xt_socket.c
2013-09-05 14:38:03 -04:00
netlabel: use domain based selectors when address based selectors are not available
2013-08-02 16:57:01 -07:00
net: netlink: filter particular protocols from analyzers
2013-09-06 14:43:48 -04:00
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
NFC: Update secure element state
2013-08-14 01:13:40 +02:00
net: ovs: flow: fix potential illegal memory access in __parse_flow_nlattrs
2013-09-11 16:09:58 -04:00
net: packet: use reciprocal_divide in fanout_demux_hash
2013-08-29 16:43:29 -04:00
net: proc_fs: trivial: print UIDs as unsigned int
2013-08-15 14:37:46 -07:00
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-09-05 14:54:29 -07:00
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
net_sched: htb: fix a typo in htb_change_class()
2013-09-11 17:16:22 -04:00
net: sctp: fix smatch warning in sctp_send_asconf_del_ip
2013-09-11 16:10:00 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-09-12 15:01:38 -07:00
tipc: set sk_err correctly when connection fails
2013-08-30 16:06:57 -04:00
af_unix: fix bug on large send()
2013-08-11 22:02:36 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-08-16 15:37:26 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-09-05 14:54:29 -07:00
x25: add a sanity check parsing X.25 facilities
2013-09-04 00:27:27 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-09-05 14:58:52 -04:00
net: Unbreak compat_sys_{send,recv}msg
2013-06-06 11:52:14 -07:00
Remove GENERIC_HARDIRQ config option
2013-09-13 15:09:52 +02:00
MPLS: Add limited GSO support
2013-05-27 22:50:59 -07:00
Merge git://git.kvack.org/~bcrl/aio-next
2013-09-13 10:55:58 -07:00
9bf12df31f