projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eaf47b1 918fe1b)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 3 Jun 2018 13:31:58 +0000 (09:31 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 3 Jun 2018 13:31:58 +0000 (09:31 -0400)
commit9c54aeb03a6d65a5834bd92376e921cbac6dfb8f
tree70441095d58678711d68cfef4934765251425d1ftree | snapshot
parenteaf47b17a77fda841a1102d76c15161ee438b347commit | diff
parent918fe1b3157978ada4267468008c5f89ef101e7dcommit | diff
Merge git://git./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
MicroBlaze GIT Repository