# git rev-parse -q --verify 4a0fc73da97efd23a383ca839e6fe86410268f6b^{commit} 4a0fc73da97efd23a383ca839e6fe86410268f6b already have revision, skipping fetch # git checkout -q -f -B kisskb 4a0fc73da97efd23a383ca839e6fe86410268f6b # git clean -qxdf # < git log -1 # commit 4a0fc73da97efd23a383ca839e6fe86410268f6b # Merge: ac2224a467b4 06fc3b0d2251 # Author: Linus Torvalds # Date: Thu Sep 7 10:52:13 2023 -0700 # # Merge tag 's390-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux # # Pull more s390 updates from Heiko Carstens: # # - A couple of virtual vs physical address confusion fixes # # - Rework locking in dcssblk driver to address a lockdep warning # # - Remove support for "noexec" kernel command line option since there is # no use case where it would make sense # # - Simplify kernel mapping setup and get rid of quite a bit of code # # - Add architecture specific __set_memory_yy() functions which allow us # to modify kernel mappings. Unlike the set_memory_xx() variants they # take void pointer start and end parameters, which allows using them # without the usual casts, and also to use them on areas larger than # 8TB. # # Note that the set_memory_xx() family comes with an int num_pages # parameter which overflows with 8TB. This could be addressed by # changing the num_pages parameter to unsigned long, however requires # to change all architectures, since the module code expects an int # parameter (see module_set_memory()). # # This was indeed an issue since for debug_pagealloc() we call # set_memory_4k() on the whole identity mapping. Therefore address this # for now with the __set_memory_yy() variant, and address common code # later # # - Use dev_set_name() and also fix memory leak in zcrypt driver error # handling # # - Remove unused lsi_mask from airq_struct # # - Add warning for invalid kernel mapping requests # # * tag 's390-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: # s390/vmem: do not silently ignore mapping limit # s390/zcrypt: utilize dev_set_name() ability to use a formatted string # s390/zcrypt: don't leak memory if dev_set_name() fails # s390/mm: fix MAX_DMA_ADDRESS physical vs virtual confusion # s390/airq: remove lsi_mask from airq_struct # s390/mm: use __set_memory() variants where useful # s390/set_memory: add __set_memory() variant # s390/set_memory: generate all set_memory() functions # s390/mm: improve description of mapping permissions of prefix pages # s390/amode31: change type of __samode31, __eamode31, etc # s390/mm: simplify kernel mapping setup # s390: remove "noexec" option # s390/vmem: fix virtual vs physical address confusion # s390/dcssblk: fix lockdep warning # s390/monreader: fix virtual vs physical address confusion # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 4a0fc73da97efd23a383ca839e6fe86410268f6b # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_allmodconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 160 ARCH=m68k O=/kisskb/build/linus_allmodconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_allmodconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_allmodconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- /kisskb/src/drivers/mfd/cs42l43.c:1138:12: error: 'cs42l43_runtime_resume' defined but not used [-Werror=unused-function] 1138 | static int cs42l43_runtime_resume(struct device *dev) | ^~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/mfd/cs42l43.c:1124:12: error: 'cs42l43_runtime_suspend' defined but not used [-Werror=unused-function] 1124 | static int cs42l43_runtime_suspend(struct device *dev) | ^~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/mfd/cs42l43.c:1106:12: error: 'cs42l43_resume' defined but not used [-Werror=unused-function] 1106 | static int cs42l43_resume(struct device *dev) | ^~~~~~~~~~~~~~ /kisskb/src/drivers/mfd/cs42l43.c:1076:12: error: 'cs42l43_suspend' defined but not used [-Werror=unused-function] 1076 | static int cs42l43_suspend(struct device *dev) | ^~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: drivers/mfd/cs42l43.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:480: drivers/mfd] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:480: drivers] 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_allmodconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_m68k-gcc13 # Build took: 0:03:05.351466