# git rev-parse -q --verify e392ea4d4d00880bf94550151b1ace4f88a4b17a^{commit} e392ea4d4d00880bf94550151b1ace4f88a4b17a already have revision, skipping fetch # git checkout -q -f -B kisskb e392ea4d4d00880bf94550151b1ace4f88a4b17a # git clean -qxdf # < git log -1 # commit e392ea4d4d00880bf94550151b1ace4f88a4b17a # Merge: 707df298cbde 991a211aa99f # Author: Linus Torvalds # Date: Fri Nov 3 10:17:22 2023 -1000 # # Merge tag 's390-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux # # Pull s390 updates from Vasily Gorbik: # # - Get rid of private VM_FAULT flags # # - Add word-at-a-time implementation # # - Add DCACHE_WORD_ACCESS support # # - Cleanup control register handling # # - Disallow CPU hotplug of CPU 0 to simplify its handling complexity, # following a similar restriction in x86 # # - Optimize pai crypto map allocation # # - Update the list of crypto express EP11 coprocessor operation modes # # - Fixes and improvements for secure guests AP pass-through # # - Several fixes to address incorrect page marking for address # translation with the "cmma no-dat" feature, preventing potential # incorrect guest TLB flushes # # - Fix early IPI handling # # - Several virtual vs physical address confusion fixes # # - Various small fixes and improvements all over the code # # * tag 's390-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (74 commits) # s390/cio: replace deprecated strncpy with strscpy # s390/sclp: replace deprecated strncpy with strtomem # s390/cio: fix virtual vs physical address confusion # s390/cio: export CMG value as decimal # s390: delete the unused store_prefix() function # s390/cmma: fix handling of swapper_pg_dir and invalid_pg_dir # s390/cmma: fix detection of DAT pages # s390/sclp: handle default case in sclp memory notifier # s390/pai_crypto: remove per-cpu variable assignement in event initialization # s390/pai: initialize event count once at initialization # s390/pai_crypto: use PERF_ATTACH_TASK define for per task detection # s390/mm: add missing arch_set_page_dat() call to gmap allocations # s390/mm: add missing arch_set_page_dat() call to vmem_crst_alloc() # s390/cmma: fix initial kernel address space page table walk # s390/diag: add missing virt_to_phys() translation to diag224() # s390/mm,fault: move VM_FAULT_ERROR handling to do_exception() # s390/mm,fault: remove VM_FAULT_BADMAP and VM_FAULT_BADACCESS # s390/mm,fault: remove VM_FAULT_SIGNAL # s390/mm,fault: remove VM_FAULT_BADCONTEXT # s390/mm,fault: simplify kfence fault handling # ... # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 e392ea4d4d00880bf94550151b1ace4f88a4b17a # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig # < make -s -j 160 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- /kisskb/src/kernel/bpf/task_iter.c: In function 'bpf_iter_css_task_new': /kisskb/src/kernel/bpf/task_iter.c:917:7: error: 'CSS_TASK_ITER_PROCS' undeclared (first use in this function); did you mean 'BPF_TASK_ITER_TGID'? case CSS_TASK_ITER_PROCS | CSS_TASK_ITER_THREADED: ^~~~~~~~~~~~~~~~~~~ BPF_TASK_ITER_TGID /kisskb/src/kernel/bpf/task_iter.c:917:7: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/kernel/bpf/task_iter.c:917:29: error: 'CSS_TASK_ITER_THREADED' undeclared (first use in this function); did you mean 'BPF_TASK_ITER_TGID'? case CSS_TASK_ITER_PROCS | CSS_TASK_ITER_THREADED: ^~~~~~~~~~~~~~~~~~~~~~ BPF_TASK_ITER_TGID /kisskb/src/kernel/bpf/task_iter.c:925:53: error: invalid application of 'sizeof' to incomplete type 'struct css_task_iter' kit->css_it = bpf_mem_alloc(&bpf_global_ma, sizeof(struct css_task_iter)); ^~~~~~ /kisskb/src/kernel/bpf/task_iter.c:928:2: error: implicit declaration of function 'css_task_iter_start'; did you mean 'task_seq_start'? [-Werror=implicit-function-declaration] css_task_iter_start(css, flags, kit->css_it); ^~~~~~~~~~~~~~~~~~~ task_seq_start /kisskb/src/kernel/bpf/task_iter.c: In function 'bpf_iter_css_task_next': /kisskb/src/kernel/bpf/task_iter.c:938:9: error: implicit declaration of function 'css_task_iter_next'; did you mean 'class_dev_iter_next'? [-Werror=implicit-function-declaration] return css_task_iter_next(kit->css_it); ^~~~~~~~~~~~~~~~~~ class_dev_iter_next /kisskb/src/kernel/bpf/task_iter.c:938:9: warning: returning 'int' from a function with return type 'struct task_struct *' makes pointer from integer without a cast [-Wint-conversion] return css_task_iter_next(kit->css_it); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/kernel/bpf/task_iter.c: In function 'bpf_iter_css_task_destroy': /kisskb/src/kernel/bpf/task_iter.c:947:2: error: implicit declaration of function 'css_task_iter_end'; did you mean 'vma_iter_end'? [-Werror=implicit-function-declaration] css_task_iter_end(kit->css_it); ^~~~~~~~~~~~~~~~~ vma_iter_end cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: kernel/bpf/task_iter.o] Error 1 make[5]: *** Waiting for unfinished jobs.... 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:566, 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:32: /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c: In function 'sun3_82586_timeout': /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:990:108: warning: array subscript 1 is above array bounds of 'volatile struct transmit_cmd_struct *[1]' [-Warray-bounds] 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:12: note: in definition of macro '__swab16' __fswab16(x)) ^ /kisskb/src/include/linux/printk.h:455:26: note: in expansion of macro 'printk_index_wrap' #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__) ^~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:990:3: note: in expansion of macro 'printk' printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); ^~~~~~ make[4]: *** [/kisskb/src/scripts/Makefile.build:480: kernel/bpf] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:480: kernel] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/Makefile:1913: .] Error 2 make[1]: *** [/kisskb/src/Makefile:234: __sub-make] Error 2 make: *** [Makefile:234: __sub-make] Error 2 Command 'make -s -j 160 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc8 # Build took: 0:01:10.750702