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

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

author	David S. Miller <davem@davemloft.net>
	Sat, 26 May 2018 23:46:15 +0000 (19:46 -0400)
committer	David S. Miller <davem@davemloft.net>
	Sat, 26 May 2018 23:46:15 +0000 (19:46 -0400)
commit	a8e617abd9b9bebd8052f24cfe933832129764ed
tree	efda2b94317c914fef0bfb25fe5ada9e253d5415	tree \| snapshot
parent	ac386735b9219e6c8424c4b6d8e441becec82f78	commit \| diff
parent	571f39cd1379229cdc3dcfe5a53003059cfd05eb	commit \| diff

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

Lots of easy overlapping changes in the confict
resolutions here.

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

24 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/nospec-branch.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_ptp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/bcm-phy-lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf_verifier.h	diff1 \|	diff2 \|	blob \| history
include/net/sctp/sctp.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/nl80211.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/multicast.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_frontend.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_sockglue.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_api.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/nospec-branch.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_ptp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/bcm-phy-lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf_verifier.h	diff1 \|	diff2 \|	blob \| history
include/net/sctp/sctp.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/nl80211.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/multicast.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_frontend.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_sockglue.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_api.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history