David S. Miller
93bbbfbb4a
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
...
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2017-06-23
1) Use memdup_user to spmlify xfrm_user_policy.
From Geliang Tang.
2) Make xfrm_dev_register static to silence a sparse warning.
From Wei Yongjun.
3) Use crypto_memneq to check the ICV in the AH protocol.
From Sabrina Dubroca.
4) Remove some unused variables in esp6.
From Stephen Hemminger.
5) Extend XFRM MIGRATE to allow to change the UDP encapsulation port.
From Antony Antony.
6) Include the UDP encapsulation port to km_migrate announcements.
From Antony Antony.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-23 14:17:31 -04:00
..
6lowpan
9p
xen: fixes for 4.12 rc2
2017-05-19 15:06:48 -07:00
802
net: introduce __skb_put_[zero, data, u8]
2017-06-20 13:30:14 -04:00
8021q
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-21 17:35:22 -04:00
appletalk
networking: make skb_push & __skb_push return void pointers
2017-06-16 11:48:40 -04:00
atm
networking: make skb_put & friends return void pointers
2017-06-16 11:48:39 -04:00
ax25
networking: make skb_push & __skb_push return void pointers
2017-06-16 11:48:40 -04:00
batman-adv
networking: make skb_put & friends return void pointers
2017-06-16 11:48:39 -04:00
bluetooth
net: introduce __skb_put_[zero, data, u8]
2017-06-20 13:30:14 -04:00
bpf
bridge
net: manual clean code which call skb_put_[data:zero]
2017-06-20 13:30:15 -04:00
caif
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-15 11:59:32 -04:00
can
networking: introduce and use skb_put_data()
2017-06-16 11:48:37 -04:00
ceph
libceph: cleanup old messages according to reconnect seq
2017-05-24 18:10:51 +02:00
core
bpf: possibly avoid extra masking for narrower load in verifier
2017-06-23 14:04:11 -04:00
dcb
dcb: enforce minimum length on IEEE_APPS attribute
2017-05-21 13:42:33 -04:00
dccp
dccp: call inet_add_protocol after register_pernet_subsys in dccp_v6_init
2017-06-20 15:31:43 -04:00
decnet
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-21 17:35:22 -04:00
dns_resolver
dsa
net: manual clean code which call skb_put_[data:zero]
2017-06-20 13:30:15 -04:00
ethernet
networking: make skb_push & __skb_push return void pointers
2017-06-16 11:48:40 -04:00
hsr
net: manual clean code which call skb_put_[data:zero]
2017-06-20 13:30:15 -04:00
ieee802154
networking: introduce and use skb_put_data()
2017-06-16 11:48:37 -04:00
ife
ipv4
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2017-06-23 14:17:31 -04:00
ipv6
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2017-06-23 14:17:31 -04:00
ipx
irda
net: manual clean code which call skb_put_[data:zero]
2017-06-20 13:30:15 -04:00
iucv
networking: make skb_push & __skb_push return void pointers
2017-06-16 11:48:40 -04:00
kcm
key
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2017-06-23 14:17:31 -04:00
l2tp
l2tp: cast l2tp traffic counter to unsigned
2017-06-10 16:14:27 -04:00
l3mdev
lapb
llc
net: llc: add lock_sock in llc_ui_bind to avoid a race condition
2017-05-26 14:20:29 -04:00
mac80211
net: manual clean code which call skb_put_[data:zero]
2017-06-20 13:30:15 -04:00
mac802154
net: Fix inconsistent teardown and release of private netdev state.
2017-06-07 15:53:24 -04:00
mpls
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-06 22:20:08 -04:00
ncsi
networking: make skb_push & __skb_push return void pointers
2017-06-16 11:48:40 -04:00
netfilter
networking: make skb_put & friends return void pointers
2017-06-16 11:48:39 -04:00
netlabel
netlink
networking: make skb_put & friends return void pointers
2017-06-16 11:48:39 -04:00
netrom
nfc
networking: add and use skb_put_u8()
2017-06-16 11:48:40 -04:00
openvswitch
vxlan: get rid of redundant vxlan_dev.flags
2017-06-20 13:37:02 -04:00
packet
net/packet: remove unneeded declaraion of tpacket_snd().
2017-06-10 16:15:25 -04:00
phonet
net: Fix inconsistent teardown and release of private netdev state.
2017-06-07 15:53:24 -04:00
psample
networking: make skb_put & friends return void pointers
2017-06-16 11:48:39 -04:00
qrtr
networking: make skb_put & friends return void pointers
2017-06-16 11:48:39 -04:00
rds
rds: tcp: set linger to 1 when unloading a rds-tcp
2017-06-22 11:34:04 -04:00
rfkill
net: rfkill: gpio: Switch to devm_acpi_dev_add_driver_gpios()
2017-06-13 11:07:51 +02:00
rose
rxrpc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-21 17:35:22 -04:00
sched
bpf: expose prog id for cls_bpf and act_bpf
2017-06-21 15:14:23 -04:00
sctp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-21 17:35:22 -04:00
smc
strparser
sunrpc
SUNRPC: ensure correct error is reported by xs_tcp_setup_socket()
2017-05-31 12:26:44 -04:00
switchdev
net: switchdev: Change notifier chain to be atomic
2017-06-08 14:16:24 -04:00
tipc
net: tipc: Fix a sleep-in-atomic bug in tipc_msg_reverse
2017-06-10 18:20:38 -04:00
tls
tls: update Kconfig
2017-06-17 22:56:46 -04:00
unix
af_unix: Add sockaddr length checks before accessing sa_family in bind and connect handlers
2017-06-09 10:10:24 -04:00
vmw_vsock
net: manual clean code which call skb_put_[data:zero]
2017-06-20 13:30:15 -04:00
wimax
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-21 17:35:22 -04:00
x25
net: manual clean code which call skb_put_[data:zero]
2017-06-20 13:30:15 -04:00
xfrm
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2017-06-23 14:17:31 -04:00
compat.c
Kconfig
tls: kernel TLS support
2017-06-15 12:12:40 -04:00
Makefile
tls: kernel TLS support
2017-06-15 12:12:40 -04:00
socket.c
net: socket: fix a typo in sockfd_lookup().
2017-05-22 12:14:04 -04:00
sysctl_net.c
sysctl: Remove dead register_sysctl_root
2017-04-16 23:42:49 -05:00