]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c294ad6 e151090)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 6 Mar 2018 05:53:44 +0000 (00:53 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 6 Mar 2018 06:20:46 +0000 (01:20 -0500)
commitfda8eeaba618566df11dc752aca79e7801512ed3
tree439c89ea3c87496c23e167148f2cdbefb6e82b30tree | snapshot
parentc294ad60294f86cc82a83621630783873ad0418fcommit | diff
parente151090dcd79cb22f216485c638dd10b427c9f1bcommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

All of the conflicts were cases of overlapping changes.

In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.

Signed-off-by: David S. Miller <davem@davemloft.net>
48 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/bluetooth/btusb.c 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/mellanox/mlxsw/spectrum.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/sh_eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/sh_eth.h diff1 | diff2 | blob | history
drivers/net/ppp/ppp_generic.c diff1 | diff2 | blob | history
drivers/net/tun.c diff1 | diff2 | blob | history
include/linux/phy.h diff1 | diff2 | blob | history
include/linux/skbuff.h diff1 | diff2 | blob | history
include/net/devlink.h diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
net/batman-adv/bat_iv_ogm.c diff1 | diff2 | blob | history
net/batman-adv/bat_v.c diff1 | diff2 | blob | history
net/batman-adv/bridge_loop_avoidance.c diff1 | diff2 | blob | history
net/batman-adv/fragmentation.c diff1 | diff2 | blob | history
net/batman-adv/hard-interface.c diff1 | diff2 | blob | history
net/batman-adv/originator.c diff1 | diff2 | blob | history
net/batman-adv/originator.h diff1 | diff2 | blob | history
net/batman-adv/soft-interface.c diff1 | diff2 | blob | history
net/batman-adv/types.h diff1 | diff2 | blob | history
net/bridge/br_netfilter_hooks.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/devlink.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/ipv4/ip_gre.c diff1 | diff2 | blob | history
net/ipv4/ip_tunnel.c diff1 | diff2 | blob | history
net/ipv4/netfilter/ipt_CLUSTERIP.c diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv6/ip6_output.c diff1 | diff2 | blob | history
net/ipv6/ip6_tunnel.c diff1 | diff2 | blob | history
net/ipv6/netfilter/ip6t_rpfilter.c diff1 | diff2 | blob | history
net/ipv6/netfilter/nft_fib_ipv6.c diff1 | diff2 | blob | history
net/ipv6/sit.c diff1 | diff2 | blob | history
net/l2tp/l2tp_ip.c diff1 | diff2 | blob | history
net/l2tp/l2tp_ip6.c diff1 | diff2 | blob | history
net/l2tp/l2tp_ppp.c diff1 | diff2 | blob | history
net/mac80211/rx.c diff1 | diff2 | blob | history
net/mac80211/tx.c diff1 | diff2 | blob | history
net/smc/af_smc.c diff1 | diff2 | blob | history
net/smc/smc_core.c diff1 | diff2 | blob | history
net/smc/smc_llc.c diff1 | diff2 | blob | history
net/tipc/group.c diff1 | diff2 | blob | history
net/tipc/socket.c diff1 | diff2 | blob | history
tools/testing/selftests/bpf/test_verifier.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.