git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Fri, 4 Dec 2015 02:03:21 +0000 (21:03 -0500)
committer	David S. Miller <davem@davemloft.net>
	Fri, 4 Dec 2015 02:09:12 +0000 (21:09 -0500)
commit	1e1e12a5b7abb2d2926f682bdcf2d51005079843
tree	17ad63719242b1de0266627a1dc92ba869a3ba4e	tree \| snapshot
parent	7633a80b86bfab27d3dd35f67790ba79ccb696b1	commit \| diff
parent	23a216d9e4bbd0ebc3bcefb4fc4e1614b28c94d3	commit \| diff

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

Conflicts:
drivers/net/ethernet/renesas/ravb_main.c
kernel/bpf/syscall.c
net/ipv4/ipmr.c

All three conflicts were cases of overlapping changes.

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

38 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
crypto/algif_aead.c	diff1 \|	diff2 \|	blob \| history
crypto/algif_skcipher.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/xilinx_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/apm/xgene/xgene_enet_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/alx/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvneta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/ravb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vrf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-7000.c	diff1 \|	\|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-8000.c	diff1 \|	\|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/d3.c	diff1 \|	\|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c	diff1 \|	\|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/sta.c	diff1 \|	\|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/sta.h	diff1 \|	\|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/drv.c	diff1 \|	\|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/af_bluetooth.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/core/stream.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipmr.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/iucv/af_iucv.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/vport-netdev.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/tipc/link.c	diff1 \|	diff2 \|	blob \| history
net/tipc/socket.c	diff1 \|	diff2 \|	blob \| history
net/tipc/udp_media.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
crypto/algif_aead.c	diff1 \|	diff2 \|	blob \| history
crypto/algif_skcipher.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/xilinx_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/apm/xgene/xgene_enet_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/alx/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvneta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/ravb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vrf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-7000.c	diff1 \|	\|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-8000.c	diff1 \|	\|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/d3.c	diff1 \|	\|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c	diff1 \|	\|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/sta.c	diff1 \|	\|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/sta.h	diff1 \|	\|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/drv.c	diff1 \|	\|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/af_bluetooth.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/core/stream.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipmr.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/iucv/af_iucv.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/vport-netdev.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/tipc/link.c	diff1 \|	diff2 \|	blob \| history
net/tipc/socket.c	diff1 \|	diff2 \|	blob \| history
net/tipc/udp_media.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history