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

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

author	David S. Miller <davem@davemloft.net>
	Sun, 3 Jun 2018 13:31:58 +0000 (09:31 -0400)
committer	David S. Miller <davem@davemloft.net>
	Sun, 3 Jun 2018 13:31:58 +0000 (09:31 -0400)
commit	fd1667c60df2374ded29566a85fd06760e09967d
tree	70441095d58678711d68cfef4934765251425d1f	tree \| snapshot
parent	6c793eee9f6638f9435d58749be109aa90e6007f	commit \| diff
parent	945909191d5ccebbbef467913abbf9a0c00b9555	commit \| diff

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

Filling in the padding slot in the bpf structure as a bug fix in 'ne'
overlapped with actually using that padding area for something in
'net-next'.

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

24 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/b53/b53_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/b53/b53_priv.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/socionext/netsec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/qmi_wwan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ralink/rt2x00/rt2x00queue.c	diff1 \|	diff2 \|	blob \| history
drivers/vhost/net.c	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
net/bridge/netfilter/ebtables.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/seg6_iptunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/xfrm6_policy.c	diff1 \|	diff2 \|	blob \| history
net/ncsi/ncsi-netlink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ctl.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_ct.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_meta.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_flower.c	diff1 \|	diff2 \|	blob \| history
tools/include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/b53/b53_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/b53/b53_priv.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/socionext/netsec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/qmi_wwan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ralink/rt2x00/rt2x00queue.c	diff1 \|	diff2 \|	blob \| history
drivers/vhost/net.c	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
net/bridge/netfilter/ebtables.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/seg6_iptunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/xfrm6_policy.c	diff1 \|	diff2 \|	blob \| history
net/ncsi/ncsi-netlink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ctl.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_ct.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_meta.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_flower.c	diff1 \|	diff2 \|	blob \| history
tools/include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history