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

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

author	David S. Miller <davem@davemloft.net>
	Tue, 22 Sep 2020 23:45:34 +0000 (16:45 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 22 Sep 2020 23:45:34 +0000 (16:45 -0700)
commit	7fd252119030af31277b8009c2eba597d7d793d0
tree	d2ae17c3bfc829ce0c747ad97021cd4bc8fb11dc	tree \| snapshot
parent	ef7a0c0bd5461b8dddb30fcea99edc0ecfd72742	commit \| diff
parent	c052df253e4af56921ef512f80d09043729652ae	commit \| diff

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

Two minor conflicts:

1) net/ipv4/route.c, adding a new local variable while
   moving another local variable and removing it's
   initial assignment.

2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes.
   One pretty prints the port mode differently, whilst another
   changes the driver to try and obtain the port mode from
   the port node rather than the switch node.

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

72 files changed:

Documentation/networking/ethtool-netlink.rst	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz9477.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/ocelot/felix.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/ocelot/felix_vsc9959.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/ocelot/seville_vsc9953.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/rtl8366.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/de2104x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/huawei/hinic/hinic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/huawei/hinic/hinic_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/huawei/hinic/hinic_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvneta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.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_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_stats.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw_new.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/marvell/mwifiex/fw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l3_main.c	diff1 \|	diff2 \|	blob \| history
fs/io_uring.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/linux/qed/qed_if.h	diff1 \|	diff2 \|	blob \| history
include/net/netlink.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/ethtool_netlink.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/hashtab.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/inode.c	diff1 \|	diff2 \|	blob \| history
mm/filemap.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/bridge_loop_avoidance.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/multicast.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/soft-interface.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_vlan.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/dsa/slave.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_diag.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/vht.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/pm_netlink.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/subflow.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/tipc/link.c	diff1 \|	diff2 \|	blob \| history
net/tipc/msg.c	diff1 \|	diff2 \|	blob \| history
net/tipc/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/util.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xdp_umem.c	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/Makefile	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/libbpf.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

Documentation/networking/ethtool-netlink.rst	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz9477.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/ocelot/felix.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/ocelot/felix_vsc9959.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/ocelot/seville_vsc9953.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/rtl8366.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/de2104x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/huawei/hinic/hinic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/huawei/hinic/hinic_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/huawei/hinic/hinic_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvneta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.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_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_stats.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw_new.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/marvell/mwifiex/fw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l3_main.c	diff1 \|	diff2 \|	blob \| history
fs/io_uring.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/linux/qed/qed_if.h	diff1 \|	diff2 \|	blob \| history
include/net/netlink.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/ethtool_netlink.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/hashtab.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/inode.c	diff1 \|	diff2 \|	blob \| history
mm/filemap.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/bridge_loop_avoidance.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/multicast.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/soft-interface.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_vlan.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/dsa/slave.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_diag.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/vht.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/pm_netlink.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/subflow.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/tipc/link.c	diff1 \|	diff2 \|	blob \| history
net/tipc/msg.c	diff1 \|	diff2 \|	blob \| history
net/tipc/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/util.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xdp_umem.c	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/Makefile	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/libbpf.c	diff1 \|	diff2 \|	blob \| history