# git rev-parse -q --verify ebf435d3b51b22340ef047aad0c2936ec4833ab2^{commit} ebf435d3b51b22340ef047aad0c2936ec4833ab2 already have revision, skipping fetch # git checkout -q -f -B kisskb ebf435d3b51b22340ef047aad0c2936ec4833ab2 # git clean -qxdf # < git log -1 # commit ebf435d3b51b22340ef047aad0c2936ec4833ab2 # Merge: c6c3c5704ba7 4adb389e08c9 # Author: Linus Torvalds # Date: Wed Sep 1 09:45:57 2021 -0700 # # Merge tag 'staging-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging # # Pull IIO and staging driver updates from Greg KH: # "Here is the big set of staging and IIO driver updates for 5.15-rc1. # Also included in here are the counter driver subsystem updates as the # IIO drivers needed them. # # Lots of churn in some staging drivers, we dropped the "old" rtl8188eu # driver and replaced it with a newer version of the driver that had # been maintained out-of-tree by Larry with the end goal of actually # being able to get this driver out of staging eventually. Despite that # driver being "newer" the line count of this pull request is going up. # # Some drivers moved out of staging as well, which is always nice to # see, that is why there are additions to the mfc and misc driver # subsystems. All of these were acked by the various subsystem # maintainers involved. # # But by far, as normal, it's coding style cleanups all over the # drivers/staging/ tree in here. # # Full details of these changes are in the shortlog. # # All of these have been in linux-next for a while with no reported # problems" # # [ Note: the r8188eu merge clashed with commit 89939e890605 ("staging: # rtlwifi: use siocdevprivate") from the networking tree. When resolving # the issue, I noted that the whole r8188eu rtw_android code is dead # since commit ae7471cae00a ("staging: r8188eu: remove rtw_ioctl # function"). # # End result: the merge resolution was to throw all of that away, # rather than do the mindless fixup to code that isn't actually # reachable - Linus ] # # * tag 'staging-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (551 commits) # staging: vt6655: Remove filenames in files # staging: r8188eu: add extra TODO entries # staging: vt6656: Remove filenames in files # staging: wlan-ng: fix invalid assignment warning # staging: r8188eu: rename fields of struct rtl_ps # staging: r8188eu: remove ODM_DynamicPrimaryCCA_DupRTS() # staging: r8188eu: rename fields of struct dyn_primary_cca # staging: r8188eu: rename struct field Wifi_Error_Status # staging: r8188eu: Provide a TODO file for this driver # staging: r8188eu: remove unneeded variable # staging: r8188eu: remove unneeded conversions to bool # staging: r8188eu: remove {read,write}_macreg # staging: r8188eu: core: remove condition with no effect # staging: r8188eu: remove ethernet.h header file # staging: r8188eu: remove ip.h header file # staging: r8188eu: remove if_ether.h header file # staging: r8188eu: make rtw_deinit_intf_priv return void # staging: r8188eu: use is_multicast_ether_addr in os_dep/recv_linux.c # staging: r8188eu: use is_multicast_ether_addr in hal/rtl8188eu_xmit.c # staging: r8188eu: use is_multicast_ether_addr in core/rtw_xmit.c # ... # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/i386-linux/bin/i386-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/i386-linux/bin/i386-linux-ld --version # < git log --format=%s --max-count=1 ebf435d3b51b22340ef047aad0c2936ec4833ab2 # < make -s -j 120 ARCH=i386 O=/kisskb/build/linus_i386-allnoconfig_i386-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/i386-linux/bin/i386-linux- allnoconfig # < make -s -j 120 ARCH=i386 O=/kisskb/build/linus_i386-allnoconfig_i386-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/i386-linux/bin/i386-linux- help # make -s -j 120 ARCH=i386 O=/kisskb/build/linus_i386-allnoconfig_i386-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/i386-linux/bin/i386-linux- olddefconfig # make -s -j 120 ARCH=i386 O=/kisskb/build/linus_i386-allnoconfig_i386-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/i386-linux/bin/i386-linux- /kisskb/src/arch/x86/kernel/setup.c: In function 'setup_arch': /kisskb/src/arch/x86/kernel/setup.c:916:2: error: implicit declaration of function 'acpi_mps_check' [-Werror=implicit-function-declaration] if (acpi_mps_check()) { ^ /kisskb/src/arch/x86/kernel/setup.c:1110:2: error: implicit declaration of function 'acpi_table_upgrade' [-Werror=implicit-function-declaration] acpi_table_upgrade(); ^ /kisskb/src/arch/x86/kernel/setup.c:1112:2: error: implicit declaration of function 'acpi_boot_table_init' [-Werror=implicit-function-declaration] acpi_boot_table_init(); ^ /kisskb/src/arch/x86/kernel/setup.c:1120:2: error: implicit declaration of function 'early_acpi_boot_init' [-Werror=implicit-function-declaration] early_acpi_boot_init(); ^ /kisskb/src/arch/x86/kernel/setup.c:1162:2: error: implicit declaration of function 'acpi_boot_init' [-Werror=implicit-function-declaration] acpi_boot_init(); ^ cc1: some warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:271: arch/x86/kernel/setup.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:514: arch/x86/kernel] Error 2 make[1]: *** [/kisskb/src/Makefile:1851: arch/x86] Error 2 make: *** [Makefile:220: __sub-make] Error 2 Command 'make -s -j 120 ARCH=i386 O=/kisskb/build/linus_i386-allnoconfig_i386-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/i386-linux/bin/i386-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_i386-allnoconfig_i386-gcc4.9 # Build took: 0:00:16.903354