Linus Torvalds 410da1e12f net/smc: fix up merge error with poll changes ... My networking merge (commit 4e33d7d47943: "Pull networking fixes from David Miller") got the poll() handling conflict wrong for af_smc. The conflict between my a11e1d432b ("Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL") and Ursula Braun's 24ac3a08e6 ("net/smc: rebuild nonblocking connect") should have left the call to sock_poll_wait() in place, just without the socket lock release/retake. And I really should have realized that. But happily, I at least asked Ursula to double-check the merge, and she set me right. This also fixes an incidental whitespace issue nearby that annoyed me while looking at this. Pointed-out-by: Ursula Braun <ubraun@linux.ibm.com> Cc: David Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2018-07-03 09:53:43 -07:00
..
6lowpan	…
9p	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
802	…
8021q	net: fix use-after-free in GRO with ESP	2018-07-02 20:34:04 +09:00
appletalk	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
atm	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
ax25	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
batman-adv	…
bluetooth	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
bpf	…
bpfilter	bpfilter: include bpfilter_umh in assembly instead of using objcopy	2018-06-28 21:39:16 +09:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-06-16 07:39:34 +09:00
caif	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
can	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
ceph	The main piece is a set of libceph changes that revamps how OSD	2018-06-15 07:24:58 +09:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-07-02 11:18:28 -07:00
dcb	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
dccp	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
decnet	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
dns_resolver	…
dsa	net: dsa: add error handling for pskb_trim_rcsum	2018-06-11 14:19:38 -07:00
ethernet	…
hsr	…
ieee802154	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
ife	…
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-07-02 11:18:28 -07:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-07-02 11:18:28 -07:00
iucv	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
kcm	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
key	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
l2tp	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
l3mdev	…
lapb	…
llc	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
mac80211	mac80211: disable BHs/preemption in ieee80211_tx_control_port()	2018-06-29 09:39:08 +02:00
mac802154	…
mpls	…
ncsi	net/ncsi: Use netdev_dbg for debug messages	2018-06-20 07:26:58 +09:00
netfilter	netfilter: nf_conncount: fix garbage collection confirm race	2018-06-26 18:28:57 +02:00
netlabel	…
netlink	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
netrom	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
nfc	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
nsh	…
openvswitch	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
packet	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
phonet	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
psample	…
qrtr	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
rds	rds: clean up loopback rds_connections on netns deletion	2018-06-27 10:11:03 +09:00
rfkill	…
rose	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
rxrpc	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
sched	net_sched: remove a bogus warning in hfsc	2018-06-23 10:58:46 +09:00
sctp	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
smc	net/smc: fix up merge error with poll changes	2018-07-03 09:53:43 -07:00
strparser	strparser: Remove early eaten to fix full tcp receive buffer stall	2018-06-28 21:37:26 +09:00
sunrpc	NFS client bugfixes for Linux 4.18	2018-06-22 06:21:34 +09:00
switchdev	…
tipc	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
tls	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
unix	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
vmw_vsock	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
wimax	…
wireless	nl80211: check nla_parse_nested() return values	2018-06-29 09:44:51 +02:00
x25	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
xdp	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
xfrm	…
Kconfig	…
Makefile	bpfilter: check compiler capability in Kconfig	2018-06-28 13:36:39 +09:00
compat.c	…
socket.c	net: handle NULL ->poll gracefully	2018-06-29 06:51:51 -07:00
sysctl_net.c	…