]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7f87735 ec2f699)
Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux
authorDavid S. Miller <davem@davemloft.net>
Fri, 20 Jul 2018 21:45:10 +0000 (14:45 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Jul 2018 04:17:12 +0000 (21:17 -0700)
commit868a56648765a8969241d8e4339f7c337759321f
treea33d9f228efd34b0ad18e380385093405ef72d98tree | snapshot
parent7f87735fdefc66a1bfc7dc41df8a1cd6287a4e36commit | diff
parentec2f6996fbaaa318ddf68817c41cd433d052bd81commit | diff
Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

All conflicts were trivial overlapping changes, so reasonably
easy to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>
48 files changed:
Documentation/devicetree/bindings/net/fsl-fman.txt diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/aquantia/atlantic/aq_hw.h diff1 | diff2 | blob | history
drivers/net/ethernet/aquantia/atlantic/aq_nic.c diff1 | diff2 | blob | history
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c diff1 | diff2 | blob | history
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bcmsysport.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/tg3.c diff1 | diff2 | blob | history
drivers/net/ethernet/cavium/Kconfig diff1 | diff2 | blob | history
drivers/net/ethernet/cavium/liquidio/lio_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed_mcp.c diff1 | diff2 | blob | history
drivers/net/ethernet/realtek/r8169.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/ravb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/sh_eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/efx.c diff1 | diff2 | blob | history
drivers/net/tun.c diff1 | diff2 | blob | history
drivers/net/usb/asix_devices.c diff1 | diff2 | blob | history
drivers/net/usb/lan78xx.c diff1 | diff2 | blob | history
drivers/net/usb/rtl8150.c diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtlwifi/base.c diff1 | diff2 | blob | history
include/linux/skbuff.h diff1 | diff2 | blob | history
include/net/ipv6.h diff1 | diff2 | blob | history
include/net/tcp.h diff1 | diff2 | blob | history
lib/rhashtable.c diff1 | diff2 | blob | history
net/batman-adv/debugfs.c diff1 | diff2 | blob | history
net/core/filter.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/ipv4/inet_fragment.c diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/ipv4/tcp_ipv4.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/ipv6/ip6_gre.c diff1 | diff2 | blob | history
net/ipv6/ipv6_sockglue.c diff1 | diff2 | blob | history
net/netfilter/nf_conntrack_core.c diff1 | diff2 | blob | history
net/packet/af_packet.c diff1 | diff2 | blob | history
net/sched/act_csum.c diff1 | diff2 | blob | history
net/sched/act_tunnel_key.c diff1 | diff2 | blob | history
net/sched/cls_api.c diff1 | diff2 | blob | history
net/smc/af_smc.c diff1 | diff2 | blob | history
net/smc/smc_clc.c diff1 | diff2 | blob | history
net/tipc/node.c diff1 | diff2 | blob | history
net/tls/tls_sw.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.