git.osdn.net Git - uclinux-h8/linux.git/commit

(root) / uclinux-h8 / linux.git / commit

author	Jakub Kicinski <jakub.kicinski@netronome.com>
	Sat, 23 Nov 2019 00:27:24 +0000 (16:27 -0800)
committer	Jakub Kicinski <jakub.kicinski@netronome.com>
	Sat, 23 Nov 2019 00:27:24 +0000 (16:27 -0800)
commit	a9f852e92e40992c4ff09ac3940f7725e016317a
tree	e6c40313de08cfb69b806a44dd777432d2b9ef29	tree \| snapshot
parent	3243e04ab1c06e7cb1402aff609c83de97956489	commit \| diff
parent	34c36f4564b8a3339db3ce832a5aaf1871185685	commit \| diff

Merge git://git./linux/kernel/git/netdev/net

Minor conflict in drivers/s390/net/qeth_l2_main.c, kept the lock
from commit c8183f548902 ("s390/qeth: fix potential deadlock on
workqueue flush"), removed the code which was removed by commit
9897d583b015 ("s390/qeth: consolidate some duplicated HW cmd code").

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>

31 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/hyperv_net.h	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phylink.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core.h	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_sys.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/tls.h	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/sysctl_net_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_pedit.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_tunnel_key.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_main.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

About OSDN

Find Software

Develop Software

Help

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/hyperv_net.h	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phylink.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core.h	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_sys.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/tls.h	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/sysctl_net_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_pedit.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_tunnel_key.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_main.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history