Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

This merges (3f509c6 netfilter: nf_nat_sip: fix incorrect handling of EBUSY for RTCP expectation) to Patrick McHardy's IPv6 NAT changes.
2026-11-13 07:31:07 +00:00 · 2012-09-03 15:28:30 +02:00 · 2012-09-03 15:28:30 +02:00 · ace1fe1231
commit ace1fe1231
parent ce9f3f31ef a2dc375e12
373 changed files with 8501 additions and 5085 deletions
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
--- a/net/appletalk/atalk_proc.c
+++ b/net/appletalk/atalk_proc.c
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
--- a/net/ax25/ax25_uid.c
+++ b/net/ax25/ax25_uid.c
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
--- a/net/batman-adv/bridge_loop_avoidance.h
+++ b/net/batman-adv/bridge_loop_avoidance.h
--- a/net/batman-adv/debugfs.c
+++ b/net/batman-adv/debugfs.c
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
--- a/net/batman-adv/soft-interface.h
+++ b/net/batman-adv/soft-interface.h
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
--- a/net/batman-adv/translation-table.h
+++ b/net/batman-adv/translation-table.h
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
--- a/net/batman-adv/vis.h
+++ b/net/batman-adv/vis.h
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
--- a/net/ceph/debugfs.c
+++ b/net/ceph/debugfs.c
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
--- a/net/core/request_sock.c
+++ b/net/core/request_sock.c
--- a/net/core/scm.c
+++ b/net/core/scm.c
--- a/net/core/sock.c
+++ b/net/core/sock.c
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
--- a/net/ipv4/tcp_fastopen.c
+++ b/net/ipv4/tcp_fastopen.c
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
--- a/net/ipv4/udp_diag.c
+++ b/net/ipv4/udp_diag.c
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
--- a/net/ipv6/syncookies.c
+++ b/net/ipv6/syncookies.c
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
--- a/net/ipx/ipx_proc.c
+++ b/net/ipx/ipx_proc.c
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
--- a/net/l2tp/l2tp_core.h
+++ b/net/l2tp/l2tp_core.h
--- a/net/llc/llc_proc.c
+++ b/net/llc/llc_proc.c
--- a/net/mac80211/aes_cmac.c
+++ b/net/mac80211/aes_cmac.c
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
--- a/net/mac80211/rate.h
+++ b/net/mac80211/rate.h
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
--- a/net/netfilter/nf_nat_sip.c
+++ b/net/netfilter/nf_nat_sip.c
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
--- a/net/netfilter/xt_LOG.c
+++ b/net/netfilter/xt_LOG.c
--- a/net/netfilter/xt_owner.c
+++ b/net/netfilter/xt_owner.c
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
--- a/Show more
+++ b/Show more