David S. Miller
b48b63a1f6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
net/netfilter/nfnetlink_log.c
net/netfilter/xt_LOG.c
Rather easy conflict resolution, the 'net' tree had bug fixes to make
sure we checked if a socket is a time-wait one or not and elide the
logging code if so.
Whereas on the 'net-next' side we are calculating the UID and GID from
the creds using different interfaces due to the user namespace changes
from Eric Biederman.
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-09-15 11:43:53 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
net:bridge: use IS_ENABLED
2011-12-16 15:49:52 -05:00
bridge: fix rcu dereference outside of rcu_read_lock
2012-08-15 15:09:41 -07:00
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
netpoll: check netpoll tx status on the right device
2012-08-14 14:33:32 -07:00
bridge: add some comments for NETDEV_RELEASE
2012-08-14 14:33:31 -07:00
bridge: Convert compare_ether_addr to ether_addr_equal
2012-05-09 20:49:17 -04:00
bridge: Fix enforcement of multicast hash_max limit
2012-07-16 22:59:30 -07:00
net: Pass optional SKB and SK arguments to dst_ops->{update_pmtu,redirect}()
2012-07-17 03:29:28 -07:00
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
netpoll: use GFP_ATOMIC in slave_enable_netpoll() and __netpoll_setup()
2012-08-14 14:33:30 -07:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
bridge: Convert compare_ether_addr to ether_addr_equal
2012-05-09 20:49:17 -04:00
bridge: Convert compare_ether_addr to ether_addr_equal
2012-05-09 20:49:17 -04:00
time: jiffies_delta_to_clock_t() helper to the rescue
2012-08-09 16:17:03 -07:00
bridge: Add multicast_querier toggle and disable queries by default
2012-04-15 12:51:35 -04:00
bridge: make port attributes const
2012-07-30 14:53:22 -07:00
b48b63a1f6