# 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-10.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 ebf435d3b51b22340ef047aad0c2936ec4833ab2 # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- se7619_defconfig # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 32 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 32 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1515:2: warning: #warning syscall clone3 not implemented [-Wcpp] In file included from /kisskb/src/arch/sh/include/asm/hw_irq.h:6, from /kisskb/src/include/linux/irq.h:593, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/sh/include/asm/hardirq.h:9, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/serial_core.h:13, from /kisskb/src/include/linux/serial_sci.h:6, from /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:11: /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:105:24: note: in expansion of macro '_INTC_ARRAY' 105 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:106:2: note: in expansion of macro '_INTC_ARRAY' 106 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:2: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:27: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/block/mq-deadline.c:274:12: warning: 'dd_queued' defined but not used [-Wunused-function] 274 | static u32 dd_queued(struct deadline_data *dd, enum dd_prio prio) | ^~~~~~~~~ /kisskb/src/drivers/tty/serial/sh-sci.c: In function 'sci_remap_port': /kisskb/src/drivers/tty/serial/sh-sci.c:2657:19: warning: unused variable 'sport' [-Wunused-variable] 2657 | struct sci_port *sport = to_sci_port(port); | ^~~~~ Completed OK # rm -rf /kisskb/build/linus_se7619_defconfig_sh4-gcc10 # Build took: 0:00:17.503443