# git rev-parse -q --verify 89b749d8552d78c4dd86dea86e2e6ba8aafab9fe^{commit} 89b749d8552d78c4dd86dea86e2e6ba8aafab9fe already have revision, skipping fetch # git checkout -q -f -B kisskb 89b749d8552d78c4dd86dea86e2e6ba8aafab9fe # git clean -qxdf # < git log -1 # commit 89b749d8552d78c4dd86dea86e2e6ba8aafab9fe # Merge: d6ffe6067a54 a5a923038d70 # Author: Linus Torvalds # Date: Sat Aug 27 09:57:58 2022 -0700 # # Merge tag 'fbdev-for-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev # # Pull fbdev fixes and updates from Helge Deller: # "Mostly just small patches, with the exception of the bigger indenting # cleanups in the sisfb and radeonfb drivers. # # Two patches should be mentioned though: A fix-up for fbdev if the # screen resize fails (by Shigeru Yoshida), and a potential divide by # zero fix in fb_pm2fb (by Letu Ren). # # Summary: # # Major fixes: # - Revert the changes for fbcon console when vc_resize() fails # [Shigeru Yoshida] # - Avoid a potential divide by zero error in fb_pm2fb [Letu Ren] # # Minor fixes: # - Add missing pci_disable_device() in chipsfb_pci_init() [Yang # Yingliang] # - Fix tests for platform_get_irq() failure in omapfb [Yu Zhe] # - Destroy mutex on freeing struct fb_info in fbsysfs [Shigeru # Yoshida] # # Cleanups: # - Move fbdev drivers from strlcpy to strscpy [Wolfram Sang] # - Indenting fixes, comment fixes, ... [Jiapeng Chong & Jilin Yuan]" # # * tag 'fbdev-for-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: # fbdev: fbcon: Properly revert changes when vc_resize() failed # fbdev: Move fbdev drivers from strlcpy to strscpy # fbdev: omap: Remove unnecessary print function dev_err() # fbdev: chipsfb: Add missing pci_disable_device() in chipsfb_pci_init() # fbdev: fbcon: Destroy mutex on freeing struct fb_info # fbdev: radeon: Clean up some inconsistent indenting # fbdev: sisfb: Clean up some inconsistent indenting # fbdev: fb_pm2fb: Avoid potential divide by zero error # fbdev: ssd1307fb: Fix repeated words in comments # fbdev: omapfb: Fix tests for platform_get_irq() failure # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 89b749d8552d78c4dd86dea86e2e6ba8aafab9fe # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/include/linux/string.h:20, from /kisskb/src/include/linux/bitmap.h:11, from /kisskb/src/include/linux/cpumask.h:12, from /kisskb/src/include/linux/mm_types_task.h:14, from /kisskb/src/include/linux/mm_types.h:5, from /kisskb/src/include/linux/buildid.h:5, from /kisskb/src/include/linux/module.h:14, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:32: In function 'check586', inlined from 'sun3_82586_probe1' at /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:365:6, inlined from 'sun3_82586_probe' at /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:311:8: /kisskb/src/arch/m68k/include/asm/string.h:68:25: warning: '__builtin_memset' offset [0, 11] is out of the bounds [0, 0] [-Warray-bounds] 68 | #define memset(d, c, n) __builtin_memset(d, c, n) | ^~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:218:9: note: in expansion of macro 'memset' 218 | memset((char *)p->scp,0, sizeof(struct scp_struct)); | ^~~~~~ In file included from /kisskb/src/include/linux/swab.h:5, from /kisskb/src/include/uapi/linux/byteorder/big_endian.h:14, from /kisskb/src/include/linux/byteorder/big_endian.h:5, from /kisskb/src/arch/m68k/include/uapi/asm/byteorder.h:5, from /kisskb/src/include/asm-generic/bitops/le.h:6, from /kisskb/src/arch/m68k/include/asm/bitops.h:545, from /kisskb/src/include/linux/bitops.h:68, from /kisskb/src/include/linux/kernel.h:22, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:31: /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c: In function 'sun3_82586_timeout': /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:122: warning: array subscript 1 is above array bounds of 'volatile struct transmit_cmd_struct *[1]' [-Warray-bounds] 989 | printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); | ~~~~~~~~~~~~^~~ /kisskb/src/include/uapi/linux/swab.h:107:19: note: in definition of macro '__swab16' 107 | __fswab16(x)) | ^ /kisskb/src/include/linux/printk.h:464:26: note: in expansion of macro 'printk_index_wrap' 464 | #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__) | ^~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:17: note: in expansion of macro 'printk' 989 | printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); | ^~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:155:46: note: while referencing 'xmit_cmds' 155 | volatile struct transmit_cmd_struct *xmit_cmds[NUM_XMIT_BUFFS]; | ^~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc11 # Build took: 0:02:48.477807