David S. Miller
59ce9670ce
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ...
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following patchset contains the first batch of Netfilter updates for
the upcoming 4.5 kernel. This batch contains userspace netfilter header
compilation fixes, support for packet mangling in nf_tables, the new
tracing infrastructure for nf_tables and cgroup2 support for iptables.
More specifically, they are:
1) Two patches to include dependencies in our netfilter userspace
headers to resolve compilation problems, from Mikko Rapeli.
2) Four comestic cleanup patches for the ebtables codebase, from Ian Morris.
3) Remove duplicate include in the netfilter reject infrastructure,
from Stephen Hemminger.
4) Two patches to simplify the netfilter defragmentation code for IPv6,
patch from Florian Westphal.
5) Fix root ownership of /proc/net netfilter for unpriviledged net
namespaces, from Philip Whineray.
6) Get rid of unused fields in struct nft_pktinfo, from Florian Westphal.
7) Add mangling support to our nf_tables payload expression, from
Patrick McHardy.
8) Introduce a new netlink-based tracing infrastructure for nf_tables,
from Florian Westphal.
9) Change setter functions in nfnetlink_log to be void, from
Rami Rosen.
10) Add netns support to the cttimeout infrastructure.
11) Add cgroup2 support to iptables, from Tejun Heo.
12) Introduce nfnl_dereference_protected() in nfnetlink, from Florian.
13) Add support for mangling pkttype in the nf_tables meta expression,
also from Florian.
BTW, I need that you pull net into net-next, I have another batch that
requires changes that I don't yet see in net.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-18 15:37:42 -05:00
9p: switch p9_client_read() to passing struct iov_iter *
2015-04-11 22:28:27 -04:00
Bluetooth: Remove unnecessary HCI_ADVERTISING_INSTANCE flag
2015-12-10 00:51:49 +01:00
caif: fix a signedness bug in cfpkt_iterate()
2015-02-20 17:35:14 -05:00
irda: Convert function pointer arrays and uses to const
2014-12-10 15:33:16 -05:00
s390/iucv: do not use arrays as argument
2015-09-21 16:03:04 -07:00
netfilter: cttimeout: add netns support
2015-12-14 12:48:58 +01:00
net: Allow accepted sockets to be bound to l3mdev domain
2015-12-18 14:43:38 -05:00
NFC: nci: non-static functions can not be inline
2015-10-28 06:44:45 +01:00
sctp: start t5 timer only when peer rwnd is 0 and local state is SHUTDOWN_PENDING
2015-12-06 22:31:51 -05:00
act_connmark: Remember the struct net instead of guessing it.
2015-09-18 21:59:31 +02:00
6lowpan: add debugfs support
2015-12-10 01:25:25 +01:00
net_sched: make tcf_hash_destroy() static
2015-08-26 11:01:44 -07:00
ipv6: remove unused neigh parameter from ndisc functions
2015-09-24 12:26:08 -07:00
ieee802154: af_ieee802154: fix typo in comment.
2015-09-17 13:20:05 +02:00
unix: avoid use-after-free in ep_remove_wait_queue
2015-11-23 12:29:58 -05:00
Revert "Merge branch 'vsock-virtio'"
2015-12-08 21:55:49 -05:00
ipsec: Remove obsolete MAX_AH_AUTH_LEN
2014-09-18 10:54:36 +02:00
neigh: Factor out ___neigh_lookup_noref
2015-03-04 00:23:23 -05:00
ax25: Stop using sock->sk_protinfo.
2015-06-28 16:55:44 -07:00
bonding: simplify / unify event handling code for 3ad mode.
2015-11-02 22:52:24 -05:00
net: Move bonding headers under include/net
2014-11-10 13:27:49 -05:00
bonding: convert num_grat_arp to the new bonding option API
2015-07-27 01:05:24 -07:00
bonding: implement lower state change propagation
2015-12-03 11:49:27 -05:00
net: un-inline sk_busy_loop()
2015-11-18 16:17:38 -05:00
cfg80211: Add support for aborting an ongoing scan
2015-12-04 14:43:32 +01:00
nl802154: add support for security layer
2015-09-30 13:16:44 +02:00
rco: Clean up casting errors
2015-12-13 23:57:45 -05:00
cipso: don't use IPCB() to locate the CIPSO IP option
2015-02-11 14:46:37 -05:00
net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
2015-12-08 22:02:33 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-05-13 14:31:43 -04:00
net: switch importing msghdr from userland to {compat_,}import_iovec()
2015-04-09 00:02:26 -04:00
net/dcb: Add IEEE QCN attribute
2015-03-06 21:50:02 -05:00
netfilter: Pass net into okfn
2015-09-17 17:18:37 -07:00
net: dsa: remove DSA link polling
2015-12-07 16:35:49 -05:00
net: fix IP early demux races
2015-12-14 23:52:00 -05:00
tun_dst: Fix potential NULL dereference
2015-11-04 21:59:22 -05:00
ipv4, ipv6: Pass net into __ip_local_out and __ip6_local_out
2015-10-08 04:27:02 -07:00
net/ethoc: support big-endian register layout
2015-09-23 15:33:15 -07:00
net: ipv6: use common fib_default_rule_pref
2015-09-09 14:19:50 -07:00
net: Rename FLOWI_FLAG_VRFSRC to FLOWI_FLAG_L3MDEV_SRC
2015-10-07 04:27:42 -07:00
flow_dissector: Don't use bit fields.
2015-09-01 16:46:08 -07:00
ip_tunnel: Ops registration for secondary encap (fou, gue)
2014-11-12 15:01:35 -05:00
net: sched: enable per cpu qstats
2014-09-30 01:02:26 -04:00
netlink: add a start callback for starting a netlink dump
2015-12-15 23:25:20 -05:00
geneve: Add geneve_get_rx_port support
2015-12-16 10:58:56 -05:00
gre: Remove support for sharing GRE protocol hook.
2015-08-10 14:03:54 -07:00
gro_cells: remove spinlock protecting receive queues
2015-08-31 15:17:17 -07:00
gue: Protocol constants for remote checksum offload
2014-11-05 16:30:03 -05:00
nl802154: add support for security layer
2015-09-30 13:16:44 +02:00
ipv6: do retries on stable privacy addresses
2015-03-23 22:12:09 -04:00
ila: Add generic ILA translation facility
2015-12-15 23:25:20 -05:00
ipv6: remove obsolete inet6 functions
2015-10-03 04:32:42 -07:00
ipv6: get rid of __inet6_hash()
2015-03-18 22:00:35 -04:00
net: avoid NULL deref in inet_ctl_sock_destroy()
2015-11-02 22:46:09 -05:00
tcp/dccp: fix hashdance race for passive sessions
2015-10-23 05:42:21 -07:00
net: fix percpu memory leaks
2015-11-02 22:47:14 -05:00
tcp/dccp: fix hashdance race for passive sessions
2015-10-23 05:42:21 -07:00
net: Allow accepted sockets to be bound to l3mdev domain
2015-12-18 14:43:38 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-10-20 06:08:27 -07:00
inet: tcp: fix inetpeer_set_addr_v4()
2015-12-16 00:14:12 -05:00
ipv4: Pass struct net into ip_defrag and ip_check_defrag
2015-10-12 19:44:16 -07:00
net: add gro_compute_pseudo functions
2014-08-24 18:09:23 -07:00
ipv6: Check rt->dst.from for the DST_NOCACHE route
2015-11-15 17:12:37 -05:00
ipv6: kill sk_dst_lock
2015-12-03 11:32:06 -05:00
ip_tunnel: disable preemption when updating per-cpu tstats
2015-11-16 14:14:32 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-11-03 13:41:45 -05:00
ip_tunnel: disable preemption when updating per-cpu tstats
2015-11-16 14:14:32 -05:00
ipvs: Remove skb_sknet
2015-09-24 09:34:43 +09:00
ipv6: add ipv6_addr_prefix_copy
2015-12-10 12:55:28 +01:00
switch ipxrtr_route_packet() from iovec to msghdr
2014-11-24 04:28:49 -05:00
wext: add checked wrappers for adding events/points to streams
2015-02-28 21:31:12 +01:00
net: l3mdev: Add master device lookup by index
2015-12-18 14:43:38 -05:00
lib80211: remove unused print_ssid()
2014-10-14 02:18:27 +02:00
llc: Make llc_conn_ev_qfyr_t function pointer arrays const
2014-12-10 15:21:24 -05:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
llc: Make llc_sap_action_t function pointer arrays const
2014-12-10 15:21:24 -05:00
dst: Pass net into dst->output
2015-10-08 04:27:03 -07:00
mac80211: add new IEEE80211_VIF_GET_NOA_UPDATE flag
2015-12-04 14:43:32 +01:00
6lowpan: cleanup lowpan_header_decompress
2015-10-21 00:49:24 +02:00
ipv6: mld: answer mldv2 queries with mldv1 reports in mldv1 fallback
2014-09-22 16:23:15 -04:00
openvswitch: Add basic MPLS support to kernel
2014-11-05 23:52:33 -08:00
mpls: multipath route support
2015-10-23 06:26:42 -07:00
Revert "ipv6: ndisc: inherit metadata dst when creating ndisc requests"
2015-12-01 15:07:59 -05:00
net: add explicit logging and stat for neighbour table overflow
2015-08-10 13:46:21 -07:00
netfilter: cttimeout: add netns support
2015-12-14 12:48:58 +01:00
netlabel: fix the netlbl_catmap_setlong() dummy function
2014-08-07 20:55:21 -04:00
netlink: add nla_get for le32 and le64
2015-09-30 13:16:44 +02:00
net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
2015-12-08 22:02:33 -05:00
nl802154: add support for security layer
2015-09-30 13:16:44 +02:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
net: sched: remove tcf_proto from ematch calls
2014-10-06 18:02:32 -04:00
net: sched: consolidate tc_classify{,_compat}
2015-08-27 14:18:48 -07:00
cfg80211: allow wiphy specific regdomain management
2014-12-17 11:49:55 +01:00
tcp/dccp: fix race at listener dismantle phase
2015-10-16 00:52:19 -07:00
net: Add source address lookup op for VRF
2015-10-07 04:27:44 -07:00
netlink: Rightsize IFLA_AF_SPEC size calculation
2015-10-21 19:15:20 -07:00
net_sched: fix qdisc_tree_decrease_qlen() races
2015-12-03 14:59:05 -05:00
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-15 07:48:18 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
switchdev: Pass original device to port netdev driver
2015-12-15 11:58:20 -05:00
net: diag: Support destroying TCP sockets.
2015-12-15 23:26:52 -05:00
inet: add TCP_NEW_SYN_RECV state
2015-03-12 22:58:12 -04:00
inet: remove BUG_ON() in twsk_destructor()
2015-07-09 15:12:20 -07:00
net: tso: add support for IPv6
2015-10-26 22:24:22 -07:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
vxlan: do not receive IPv4 packets on IPv6 socket
2015-08-29 13:07:54 -07:00
net: switch memcpy_fromiovec()/memcpy_fromiovecend() users to copy_from_iter()
2015-02-04 01:34:15 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
net: treewide: Fix typo found in DocBook/networking.xml
2014-09-05 17:35:28 -07:00
xfrm: add rcu protection to sk->sk_policy[]
2015-12-11 19:22:06 -05:00
59ce9670ce