# git rev-parse -q --verify 673b41e04a035d760bc0aff83fa9ee24fd9c2779^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master warning: The last gc run reported the following. Please correct the root cause and remove .git/gc.log. Automatic cleanup will not be performed until the file is removed. warning: There are too many unreachable loose objects; run 'git prune' to remove them. # 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/aarch64-linux/bin/aarch64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux-ld --version # < git log --format=%s --max-count=1 673b41e04a035d760bc0aff83fa9ee24fd9c2779 # < make -s -j 8 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- randconfig KCONFIG_SEED=0x97F24433 WARNING: unmet direct dependencies detected for USB_PHY Depends on [n]: USB_SUPPORT [=n] Selected by [y]: - PHY_TEGRA_XUSB [=y] && ARCH_TEGRA [=y] WARNING: unmet direct dependencies detected for USB_PHY Depends on [n]: USB_SUPPORT [=n] Selected by [y]: - PHY_TEGRA_XUSB [=y] && ARCH_TEGRA [=y] WARNING: unmet direct dependencies detected for USB_CONN_GPIO Depends on [n]: USB_SUPPORT [=n] && GPIOLIB [=y] Selected by [y]: - PHY_TEGRA_XUSB [=y] && ARCH_TEGRA [=y] # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # < make -s -j 8 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- help # make -s -j 8 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- olddefconfig WARNING: unmet direct dependencies detected for USB_PHY Depends on [n]: USB_SUPPORT [=n] Selected by [y]: - PHY_TEGRA_XUSB [=y] && ARCH_TEGRA [=y] WARNING: unmet direct dependencies detected for USB_CONN_GPIO Depends on [n]: USB_SUPPORT [=n] && GPIOLIB [=y] Selected by [y]: - PHY_TEGRA_XUSB [=y] && ARCH_TEGRA [=y] WARNING: unmet direct dependencies detected for USB_PHY Depends on [n]: USB_SUPPORT [=n] Selected by [y]: - PHY_TEGRA_XUSB [=y] && ARCH_TEGRA [=y] WARNING: unmet direct dependencies detected for USB_CONN_GPIO Depends on [n]: USB_SUPPORT [=n] && GPIOLIB [=y] Selected by [y]: - PHY_TEGRA_XUSB [=y] && ARCH_TEGRA [=y] # make -s -j 8 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- WARNING: unmet direct dependencies detected for USB_PHY Depends on [n]: USB_SUPPORT [=n] Selected by [y]: - PHY_TEGRA_XUSB [=y] && ARCH_TEGRA [=y] WARNING: unmet direct dependencies detected for USB_CONN_GPIO Depends on [n]: USB_SUPPORT [=n] && GPIOLIB [=y] Selected by [y]: - PHY_TEGRA_XUSB [=y] && ARCH_TEGRA [=y] WARNING: unmet direct dependencies detected for USB_PHY Depends on [n]: USB_SUPPORT [=n] Selected by [y]: - PHY_TEGRA_XUSB [=y] && ARCH_TEGRA [=y] WARNING: unmet direct dependencies detected for USB_CONN_GPIO Depends on [n]: USB_SUPPORT [=n] && GPIOLIB [=y] Selected by [y]: - PHY_TEGRA_XUSB [=y] && ARCH_TEGRA [=y] WARNING: unmet direct dependencies detected for USB_PHY Depends on [n]: USB_SUPPORT [=n] Selected by [y]: - PHY_TEGRA_XUSB [=y] && ARCH_TEGRA [=y] WARNING: unmet direct dependencies detected for USB_CONN_GPIO Depends on [n]: USB_SUPPORT [=n] && GPIOLIB [=y] Selected by [y]: - PHY_TEGRA_XUSB [=y] && ARCH_TEGRA [=y] drivers/phy/tegra/xusb.o: In function `tegra_xusb_port_unregister': xusb.c:(.text+0x258): undefined reference to `usb_remove_phy' drivers/phy/tegra/xusb.o: In function `tegra_xusb_padctl_probe': xusb.c:(.text+0x1524): undefined reference to `usb_get_maximum_speed' drivers/power/supply/wm831x_power.o: In function `wm831x_power_probe': wm831x_power.c:(.text+0x77c): undefined reference to `devm_usb_get_phy_by_phandle' drivers/power/supply/isp1704_charger.o: In function `isp1704_charger_probe': isp1704_charger.c:(.text+0x518): undefined reference to `devm_usb_get_phy_by_phandle' isp1704_charger.c:(.text+0x528): undefined reference to `devm_usb_get_phy' drivers/power/supply/bq25890_charger.o: In function `bq25890_probe': bq25890_charger.c:(.text+0xd14): undefined reference to `devm_usb_get_phy' make[1]: *** [/kisskb/src/Makefile:1078: vmlinux] Error 1 make: *** [Makefile:180: sub-make] Error 2 Command 'make -s -j 8 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 # Build took: 0:05:09.086009