# git rev-parse -q --verify a1d21081a60dfb7fddf4a38b66d9cef603b317a9^{commit} a1d21081a60dfb7fddf4a38b66d9cef603b317a9 already have revision, skipping fetch # git checkout -q -f -B kisskb a1d21081a60dfb7fddf4a38b66d9cef603b317a9 # git clean -qxdf # < git log -1 # commit a1d21081a60dfb7fddf4a38b66d9cef603b317a9 # Merge: e764a1e32337 1f3a090b9033 # Author: Linus Torvalds # Date: Thu Aug 13 20:03:11 2020 -0700 # # Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from David Miller: # "Some merge window fallout, some longer term fixes: # # 1) Handle headroom properly in lapbether and x25_asy drivers, from # Xie He. # # 2) Fetch MAC address from correct r8152 device node, from Thierry # Reding. # # 3) In the sw kTLS path we should allow MSG_CMSG_COMPAT in sendmsg, # from Rouven Czerwinski. # # 4) Correct fdputs in socket layer, from Miaohe Lin. # # 5) Revert troublesome sockptr_t optimization, from Christoph Hellwig. # # 6) Fix TCP TFO key reading on big endian, from Jason Baron. # # 7) Missing CAP_NET_RAW check in nfc, from Qingyu Li. # # 8) Fix inet fastreuse optimization with tproxy sockets, from Tim # Froidcoeur. # # 9) Fix 64-bit divide in new SFC driver, from Edward Cree. # # 10) Add a tracepoint for prandom_u32 so that we can more easily # perform usage analysis. From Eric Dumazet. # # 11) Fix rwlock imbalance in AF_PACKET, from John Ogness" # # * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (49 commits) # net: openvswitch: introduce common code for flushing flows # af_packet: TPACKET_V3: fix fill status rwlock imbalance # random32: add a tracepoint for prandom_u32() # Revert "ipv4: tunnel: fix compilation on ARCH=um" # net: accept an empty mask in /sys/class/net/*/queues/rx-*/rps_cpus # net: ethernet: stmmac: Disable hardware multicast filter # net: stmmac: dwmac1000: provide multicast filter fallback # ipv4: tunnel: fix compilation on ARCH=um # vsock: fix potential null pointer dereference in vsock_poll() # sfc: fix ef100 design-param checking # net: initialize fastreuse on inet_inherit_port # net: refactor bind_bucket fastreuse into helper # net: phy: marvell10g: fix null pointer dereference # net: Fix potential memory leak in proto_register() # net: qcom/emac: add missed clk_disable_unprepare in error path of emac_clks_phase1_init # ionic_lif: Use devm_kcalloc() in ionic_qcq_alloc() # net/nfc/rawsock.c: add CAP_NET_RAW check. # hinic: fix strncpy output truncated compile warnings # drivers/net/wan/x25_asy: Added needed_headroom and a skb->len check # net/tls: Fix kmap usage # ... # < /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 a1d21081a60dfb7fddf4a38b66d9cef603b317a9 # < 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 # < 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:4347:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:4349:warning: override: reassigning to symbol UML_NET_SLIP .config:4352:warning: override: reassigning to symbol UML_NET_MCAST .config:4354: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 /kisskb/src/arch/um/os-Linux/signal.c: In function 'sig_handler_common': /kisskb/src/arch/um/os-Linux/signal.c:51:1: warning: the frame size of 2976 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/arch/um/os-Linux/signal.c: In function 'timer_real_alarm_handler': /kisskb/src/arch/um/os-Linux/signal.c:95:1: warning: the frame size of 2960 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/lib/lz4/lz4hc_compress.c: In function 'LZ4HC_compress_generic': /kisskb/src/lib/lz4/lz4hc_compress.c:579:1: warning: the frame size of 2144 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ drivers/net/ethernet/xilinx/ll_temac_main.o: In function `temac_probe': /kisskb/src/drivers/net/ethernet/xilinx/ll_temac_main.c:1410: undefined reference to `devm_platform_ioremap_resource_byname' /kisskb/src/drivers/net/ethernet/xilinx/ll_temac_main.c:1477: undefined reference to `devm_of_iomap' /kisskb/src/drivers/net/ethernet/xilinx/ll_temac_main.c:1504: undefined reference to `devm_ioremap' drivers/net/ethernet/xilinx/xilinx_axienet_main.o: In function `axienet_probe': /kisskb/src/drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1810: undefined reference to `devm_ioremap_resource' drivers/ptp/ptp_ines.o: In function `ines_ptp_ctrl_probe': /kisskb/src/drivers/ptp/ptp_ines.c:789: undefined reference to `devm_platform_ioremap_resource' drivers/iio/adc/adi-axi-adc.o: In function `adi_axi_adc_probe': /kisskb/src/drivers/iio/adc/adi-axi-adc.c:415: undefined reference to `devm_platform_ioremap_resource' collect2: error: ld returned 1 exit status make[1]: *** [/kisskb/src/Makefile:1167: vmlinux] Error 1 make: *** [Makefile:185: __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:06:54.858332