]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fe7b4fa ddb3abb)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Sat, 5 Sep 2020 04:18:58 +0000 (21:18 -0700)
committerJakub Kicinski <kuba@kernel.org>
Sat, 5 Sep 2020 04:28:59 +0000 (21:28 -0700)
commit6ebb9fa50bc266cf83142bf8dd97dc5f71a007fb
tree2d29271961a485f621bd14294ec57e816290541etree | snapshot
parentfe7b4fa6204e331f11a718b898fddddff30c9d9ecommit | diff
parentddb3abbef71ea9d5a8beb52601dfe30cf57c0ff8commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

We got slightly different patches removing a double word
in a comment in net/ipv4/raw.c - picked the version from net.

Simple conflict in drivers/net/ethernet/ibm/ibmvnic.c. Use cached
values instead of VNIC login response buffer (following what
commit 326c8a21c5ba ("ibmvnic: Fix use-after-free of VNIC login
response buffer") did).

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
58 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/dsa/b53/b53_common.c diff1 | diff2 | blob | history
drivers/net/dsa/bcm_sf2.c diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/chip.c diff1 | diff2 | blob | history
drivers/net/dsa/ocelot/felix.c diff1 | diff2 | blob | history
drivers/net/ethernet/8390/axnet_cs.c diff1 | diff2 | blob | history
drivers/net/ethernet/8390/pcnet_cs.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bcmsysport.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns/hns_enet.c diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c diff1 | diff2 | blob | history
drivers/net/ethernet/ibm/ibmvnic.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/igb/igb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c diff1 | diff2 | blob | history
drivers/net/ethernet/netronome/nfp/flower/offload.c diff1 | diff2 | blob | history
drivers/net/ethernet/pensando/ionic/ionic_txrx.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/realtek/r8169_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/ravb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/farch.c diff1 | diff2 | blob | history
drivers/net/ethernet/sun/sungem.c diff1 | diff2 | blob | history
drivers/net/gtp.c diff1 | diff2 | blob | history
drivers/net/phy/dp83640.c diff1 | diff2 | blob | history
drivers/net/phy/dp83867.c diff1 | diff2 | blob | history
drivers/net/phy/phylink.c diff1 | diff2 | blob | history
drivers/net/phy/sfp.c diff1 | diff2 | blob | history
drivers/net/tun.c diff1 | diff2 | blob | history
drivers/net/usb/Kconfig diff1 | diff2 | blob | history
drivers/net/veth.c 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_l3_main.c diff1 | diff2 | blob | history
fs/io_uring.c diff1 | diff2 | blob | history
include/linux/filter.h diff1 | diff2 | blob | history
kernel/bpf/cpumap.c diff1 | diff2 | blob | history
kernel/bpf/syscall.c diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
net/batman-adv/bat_v_ogm.c diff1 | diff2 | blob | history
net/batman-adv/bridge_loop_avoidance.c diff1 | diff2 | blob | history
net/core/devlink.c diff1 | diff2 | blob | history
net/core/filter.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/core/skmsg.c diff1 | diff2 | blob | history
net/core/sock.c diff1 | diff2 | blob | history
net/ipv4/raw.c diff1 | diff2 | blob | history
net/mptcp/protocol.c diff1 | diff2 | blob | history
net/netlabel/netlabel_domainhash.c diff1 | diff2 | blob | history
net/netlink/af_netlink.c diff1 | diff2 | blob | history
net/netlink/policy.c diff1 | diff2 | blob | history
net/sctp/sm_make_chunk.c diff1 | diff2 | blob | history
net/socket.c diff1 | diff2 | blob | history
net/tipc/socket.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
net/wireless/reg.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.