# git rev-parse -q --verify 69119673bd50b176ded34032fadd41530fb5af21^{commit} 69119673bd50b176ded34032fadd41530fb5af21 already have revision, skipping fetch # git checkout -q -f -B kisskb 69119673bd50b176ded34032fadd41530fb5af21 # git clean -qxdf # < git log -1 # commit 69119673bd50b176ded34032fadd41530fb5af21 # Merge: 26c20ffcb5c8 c9f66b43ee27 # Author: Linus Torvalds # Date: Tue Jun 16 17:44:54 2020 -0700 # # Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from David Miller: # # 1) Don't get per-cpu pointer with preemption enabled in nft_set_pipapo, # fix from Stefano Brivio. # # 2) Fix memory leak in ctnetlink, from Pablo Neira Ayuso. # # 3) Multiple definitions of MPTCP_PM_MAX_ADDR, from Geliang Tang. # # 4) Accidently disabling NAPI in non-error paths of macb_open(), from # Charles Keepax. # # 5) Fix races between alx_stop and alx_remove, from Zekun Shen. # # 6) We forget to re-enable SRIOV during resume in bnxt_en driver, from # Michael Chan. # # 7) Fix memory leak in ipv6_mc_destroy_dev(), from Wang Hai. # # 8) rxtx stats use wrong index in mvpp2 driver, from Sven Auhagen. # # 9) Fix memory leak in mptcp_subflow_create_socket error path, from Wei # Yongjun. # # 10) We should not adjust the TCP window advertised when sending dup acks # in non-SACK mode, because it won't be counted as a dup by the sender # if the window size changes. From Eric Dumazet. # # 11) Destroy the right number of queues during remove in mvpp2 driver, # from Sven Auhagen. # # 12) Various WOL and PM fixes to e1000 driver, from Chen Yu, Vaibhav # Gupta, and Arnd Bergmann. # # * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (35 commits) # e1000e: fix unused-function warning # e1000: use generic power management # e1000e: Do not wake up the system via WOL if device wakeup is disabled # lan743x: add MODULE_DEVICE_TABLE for module loading alias # mlxsw: spectrum: Adjust headroom buffers for 8x ports # bareudp: Fixed configuration to avoid having garbage values # mvpp2: remove module bugfix # tcp: grow window for OOO packets only for SACK flows # mptcp: fix memory leak in mptcp_subflow_create_socket() # netfilter: flowtable: Make nf_flow_table_offload_add/del_cb inline # net/sched: act_ct: Make tcf_ct_flow_table_restore_skb inline # net: dsa: sja1105: fix PTP timestamping with large tc-taprio cycles # mvpp2: ethtool rxtx stats fix # MAINTAINERS: switch to my private email for Renesas Ethernet drivers # rocker: fix incorrect error handling in dma_rings_init # test_objagg: Fix potential memory leak in error handling # net: ethernet: mtk-star-emac: simplify interrupt handling # mld: fix memory leak in ipv6_mc_destroy_dev() # bnxt_en: Return from timer if interface is not in open state. # bnxt_en: Fix AER reset logic on 57500 chips. # ... # < /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 69119673bd50b176ded34032fadd41530fb5af21 # < make -s -j 10 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # 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 10 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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 10 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:4286:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:4288:warning: override: reassigning to symbol UML_NET_SLIP .config:4291:warning: override: reassigning to symbol UML_NET_MCAST .config:4293:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 10 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 x86_64-linux-gcc.br_real: error: -gz is not supported in this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:281: scripts/mod/empty.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1174: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 10 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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-allmodconfig_um-x86_64 # Build took: 0:00:12.455637