git.stricted.de - GitHub/LineageOS/android_kernel_motorola

projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit

author	David S. Miller <davem@davemloft.net>
	Sat, 23 Apr 2016 22:26:24 +0000 (18:26 -0400)
committer	David S. Miller <davem@davemloft.net>
	Sat, 23 Apr 2016 22:51:33 +0000 (18:51 -0400)
commit	1602f49b58abcb0d34a5f0a29d68e7c1769547aa
tree	4848fb0ffbc581ff465fd9c9e5a5b10b06f09b68	tree \| snapshot (tar.gz zip)
parent	22d37b6b0058365a80378ee6198d21e7f6c86327	commit \| diff
parent	5f44abd041c5f3be76d57579ab254d78e601315b	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Conflicts were two cases of simple overlapping changes,
nothing serious.

In the UDP case, we need to add a hlist_add_tail_rcu()
to linux/rculist.h, because we've moved UDP socket handling
away from using nulls lists.

Signed-off-by: David S. Miller <davem@davemloft.net>

34 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/fm10k/fm10k_pf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_txrx.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40evf/i40e_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40evf/i40e_txrx.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/ravb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/ops.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c	diff1 \|	diff2 \|	blob \| history
include/linux/rculist.h	diff1 \|	diff2 \|	blob \| history
include/net/ipv6.h	diff1 \|	diff2 \|	blob \| history
include/net/route.h	diff1 \|	diff2 \|	blob \| history
include/net/sctp/structs.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/datagram.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_sideeffect.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/fm10k/fm10k_pf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_txrx.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40evf/i40e_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40evf/i40e_txrx.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/ravb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/ops.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c	diff1 \|	diff2 \|	blob \| history
include/linux/rculist.h	diff1 \|	diff2 \|	blob \| history
include/net/ipv6.h	diff1 \|	diff2 \|	blob \| history
include/net/route.h	diff1 \|	diff2 \|	blob \| history
include/net/sctp/structs.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/datagram.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_sideeffect.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history