# git rev-parse -q --verify e138138003eb3b3d06cc91cf2e8c5dec77e2a31e^{commit} e138138003eb3b3d06cc91cf2e8c5dec77e2a31e already have revision, skipping fetch # git checkout -q -f -B kisskb e138138003eb3b3d06cc91cf2e8c5dec77e2a31e # git clean -qxdf # < git log -1 # commit e138138003eb3b3d06cc91cf2e8c5dec77e2a31e # Merge: 4ee998b0ef8b e43accba9b07 # Author: Linus Torvalds # Date: Wed Mar 24 18:16:04 2021 -0700 # # Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from David Miller: # "Various fixes, all over: # # 1) Fix overflow in ptp_qoriq_adjfine(), from Yangbo Lu. # # 2) Always store the rx queue mapping in veth, from Maciej # Fijalkowski. # # 3) Don't allow vmlinux btf in map_create, from Alexei Starovoitov. # # 4) Fix memory leak in octeontx2-af from Colin Ian King. # # 5) Use kvalloc in bpf x86 JIT for storing jit'd addresses, from # Yonghong Song. # # 6) Fix tx ptp stats in mlx5, from Aya Levin. # # 7) Check correct ip version in tun decap, fropm Roi Dayan. # # 8) Fix rate calculation in mlx5 E-Switch code, from arav Pandit. # # 9) Work item memork leak in mlx5, from Shay Drory. # # 10) Fix ip6ip6 tunnel crash with bpf, from Daniel Borkmann. # # 11) Lack of preemptrion awareness in macvlan, from Eric Dumazet. # # 12) Fix data race in pxa168_eth, from Pavel Andrianov. # # 13) Range validate stab in red_check_params(), from Eric Dumazet. # # 14) Inherit vlan filtering setting properly in b53 driver, from # Florian Fainelli. # # 15) Fix rtnl locking in igc driver, from Sasha Neftin. # # 16) Pause handling fixes in igc driver, from Muhammad Husaini # Zulkifli. # # 17) Missing rtnl locking in e1000_reset_task, from Vitaly Lifshits. # # 18) Use after free in qlcnic, from Lv Yunlong. # # 19) fix crash in fritzpci mISDN, from Tong Zhang. # # 20) Premature rx buffer reuse in igb, from Li RongQing. # # 21) Missing termination of ip[a driver message handler arrays, from # Alex Elder. # # 22) Fix race between "x25_close" and "x25_xmit"/"x25_rx" in hdlc_x25 # driver, from Xie He. # # 23) Use after free in c_can_pci_remove(), from Tong Zhang. # # 24) Uninitialized variable use in nl80211, from Jarod Wilson. # # 25) Off by one size calc in bpf verifier, from Piotr Krysiuk. # # 26) Use delayed work instead of deferrable for flowtable GC, from # Yinjun Zhang. # # 27) Fix infinite loop in NPC unmap of octeontx2 driver, from # Hariprasad Kelam. # # 28) Fix being unable to change MTU of dwmac-sun8i devices due to lack # of fifo sizes, from Corentin Labbe. # # 29) DMA use after free in r8169 with WoL, fom Heiner Kallweit. # # 30) Mismatched prototypes in isdn-capi, from Arnd Bergmann. # # 31) Fix psample UAPI breakage, from Ido Schimmel" # # * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (171 commits) # psample: Fix user API breakage # math: Export mul_u64_u64_div_u64 # ch_ktls: fix enum-conversion warning # octeontx2-af: Fix memory leak of object buf # ptp_qoriq: fix overflow in ptp_qoriq_adjfine() u64 calcalation # net: bridge: don't notify switchdev for local FDB addresses # net/sched: act_ct: clear post_ct if doing ct_clear # net: dsa: don't assign an error value to tag_ops # isdn: capi: fix mismatched prototypes # net/mlx5: SF, do not use ecpu bit for vhca state processing # net/mlx5e: Fix division by 0 in mlx5e_select_queue # net/mlx5e: Fix error path for ethtool set-priv-flag # net/mlx5e: Offload tuple rewrite for non-CT flows # net/mlx5e: Allow to match on MPLS parameters only for MPLS over UDP # net/mlx5: Add back multicast stats for uplink representor # net: ipconfig: ic_dev can be NULL in ic_close_devs # MAINTAINERS: Combine "QLOGIC QLGE 10Gb ETHERNET DRIVER" sections into one # docs: networking: Fix a typo # r8169: fix DMA being used after buffer free if WoL is enabled # net: ipa: fix init header command validation # ... # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 e138138003eb3b3d06cc91cf2e8c5dec77e2a31e # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allyesconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:4556:warning: override: reassigning to symbol GCC_PLUGIN_CYC_COMPLEXITY .config:4558:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:4562:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:4564:warning: override: reassigning to symbol UML_NET_SLIP .config:4567:warning: override: reassigning to symbol UML_NET_MCAST .config:4569:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] drivers/net/ethernet/xilinx/ll_temac_main.o: In function `temac_probe': /kisskb/src/drivers/net/ethernet/xilinx/ll_temac_main.c:1409: undefined reference to `devm_platform_ioremap_resource_byname' /kisskb/src/drivers/net/ethernet/xilinx/ll_temac_main.c:1476: undefined reference to `devm_of_iomap' /kisskb/src/drivers/net/ethernet/xilinx/ll_temac_main.c:1502: undefined reference to `devm_platform_ioremap_resource' drivers/net/ethernet/xilinx/xilinx_emaclite.o: In function `xemaclite_of_probe': /kisskb/src/drivers/net/ethernet/xilinx/xilinx_emaclite.c:1146: undefined reference to `devm_ioremap_resource' drivers/net/ethernet/xilinx/xilinx_axienet_main.o: In function `axienet_probe': /kisskb/src/drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1879: undefined reference to `devm_ioremap_resource' /kisskb/src/drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1987: undefined reference to `devm_ioremap_resource' /kisskb/src/drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1997: undefined reference to `devm_ioremap_resource' collect2: error: ld returned 1 exit status make[2]: *** [/kisskb/src/Makefile:1199: vmlinux] Error 1 make[1]: *** [/kisskb/src/Makefile:1178: autoksyms_recursive] Error 2 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:05:59.683477