# git rev-parse -q --verify 673b41e04a035d760bc0aff83fa9ee24fd9c2779^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master # git rev-parse -q --verify 673b41e04a035d760bc0aff83fa9ee24fd9c2779^{commit} 673b41e04a035d760bc0aff83fa9ee24fd9c2779 # git checkout -q -f -B kisskb 673b41e04a035d760bc0aff83fa9ee24fd9c2779 # git clean -qxdf # < git log -1 # commit 673b41e04a035d760bc0aff83fa9ee24fd9c2779 # Author: Randy Dunlap # Date: Sun Mar 29 09:12:31 2020 -0700 # # staging/octeon: fix up merge error # # There's a semantic conflict in the Octeon staging network driver, which # used the skb_reset_tc() function to reset skb state when re-using an # skb. But that inline helper function was removed in mainline by commit # 2c64605b590e ("net: Fix CONFIG_NET_CLS_ACT=n and # CONFIG_NFT_FWD_NETDEV={y, m} build"). # # Fix it by using skb_reset_redirect() instead. Also move it out of the # # This code path only ends up triggering if REUSE_SKBUFFS_WITHOUT_FREE is # enabled, which in turn only happens if you don't have CONFIG_NETFILTER # configured. Which was how this wasn't caught by the usual allmodconfig # builds. # # Signed-off-by: Randy Dunlap # Reported-by: Stephen Rothwell # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/x86_64-linux/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/x86_64-linux/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 673b41e04a035d760bc0aff83fa9ee24fd9c2779 # < make -s -j 24 ARCH=x86_64 O=/kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/x86_64-linux/bin/x86_64-linux- randconfig KCONFIG_SEED=0xDA8FCDFC # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # Added to kconfig CONFIG_CC_STACKPROTECTOR_STRONG=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 # < make -s -j 24 ARCH=x86_64 O=/kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/x86_64-linux/bin/x86_64-linux- help # make -s -j 24 ARCH=x86_64 O=/kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/x86_64-linux/bin/x86_64-linux- olddefconfig .config:5652:warning: override: reassigning to symbol STANDALONE # make -s -j 24 ARCH=x86_64 O=/kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/x86_64-linux/bin/x86_64-linux- drivers/pinctrl/pinctrl-ingenic.o: warning: objtool: ingenic_pinconf_set() falls through to next function ingenic_pinconf_group_set() Completed OK # rm -rf /kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc8 # Build took: 0:03:55.242265