projects / profile / ivi / kernel-x86-ivi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7f2e6a5 3f0c3c8)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 15 Sep 2012 15:43:53 +0000 (11:43 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 15 Sep 2012 15:43:53 +0000 (11:43 -0400)
commitb48b63a1f6e26b0dec2c9f1690396ed4bcb66903
tree8d9ad227c3a7d35cd78d40ecaf9bf59375dbd21atree | snapshot
parent7f2e6a5d8608d0353b017a0fe15502307593734ecommit | diff
parent3f0c3c8fe30c725c1264fb6db8cc4b69db3a658acommit | diff
Merge git://git./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>
35 files changed:
Documentation/feature-removal-schedule.txt diff1 | diff2 | blob | history
drivers/bluetooth/btusb.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c diff1 | diff2 | blob | history
drivers/net/ethernet/ti/davinci_mdio.c diff1 | diff2 | blob | history
drivers/net/usb/qmi_wwan.c diff1 | diff2 | blob | history
drivers/net/usb/sierra_net.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/xmit.c diff1 | diff2 | blob | history
drivers/net/wireless/mwifiex/cmdevt.c diff1 | diff2 | blob | history
drivers/net/wireless/rt2x00/rt2x00dev.c diff1 | diff2 | blob | history
include/net/bluetooth/smp.h diff1 | diff2 | blob | history
include/net/xfrm.h diff1 | diff2 | blob | history
net/bluetooth/l2cap_core.c diff1 | diff2 | blob | history
net/bluetooth/l2cap_sock.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/sock.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/ipv6/tcp_ipv6.c diff1 | diff2 | blob | history
net/ipv6/udp.c diff1 | diff2 | blob | history
net/l2tp/l2tp_eth.c diff1 | diff2 | blob | history
net/mac80211/cfg.c diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
net/netfilter/nf_conntrack_proto_tcp.c diff1 | diff2 | blob | history
net/netfilter/nfnetlink_log.c diff1 | diff2 | blob | history
net/netfilter/xt_LOG.c diff1 | diff2 | blob | history
net/openvswitch/actions.c diff1 | diff2 | blob | history
net/openvswitch/datapath.c diff1 | diff2 | blob | history
net/openvswitch/flow.h diff1 | diff2 | blob | history
net/sctp/output.c diff1 | diff2 | blob | history
net/socket.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
net/xfrm/xfrm_state.c diff1 | diff2 | blob | history
Domain: System / Uncategorized;