# git rev-parse -q --verify 70868a180501d17fea58153c649d56bc18435315^{commit} 70868a180501d17fea58153c649d56bc18435315 already have revision, skipping fetch # git checkout -q -f -B kisskb 70868a180501d17fea58153c649d56bc18435315 # git clean -qxdf # < git log -1 # commit 70868a180501d17fea58153c649d56bc18435315 # Merge: 2e5fd489a4e5 2b922a9d064f # Author: Linus Torvalds # Date: Thu Sep 9 11:48:27 2021 -0700 # # Merge tag 'cxl-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl # # Pull CXL (Compute Express Link) updates from Dan Williams: # # - Fix detection of CXL host bridges to filter out disabled ACPI0016 # devices in the ACPI DSDT. # # - Fix kernel lockdown integration to disable raw commands when raw PCI # access is disabled. # # - Fix a broken debug message. # # - Add support for "Get Partition Info". I.e. enumerate the split # between volatile and persistent capacity on bi-modal CXL memory # expanders. # # - Re-factor the core by subject area. This is a work in progress. # # - Prepare libnvdimm to understand CXL labels in addition to EFI labels. # This is a work in progress. # # * tag 'cxl-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl: (25 commits) # cxl/registers: Fix Documentation warning # cxl/pmem: Fix Documentation warning # cxl/uapi: Fix defined but not used warnings # cxl/pci: Fix debug message in cxl_probe_regs() # cxl/pci: Fix lockdown level # cxl/acpi: Do not add DSDT disabled ACPI0016 host bridge ports # libnvdimm/labels: Add claim class helpers # libnvdimm/labels: Add type-guid helpers # libnvdimm/labels: Add blk special cases for nlabel and position helpers # libnvdimm/labels: Add blk isetcookie set / validation helpers # libnvdimm/labels: Add a checksum calculation helper # libnvdimm/labels: Introduce label setter helpers # libnvdimm/labels: Add isetcookie validation helper # libnvdimm/labels: Introduce getters for namespace label fields # cxl/mem: Adjust ram/pmem range to represent DPA ranges # cxl/mem: Account for partitionable space in ram/pmem ranges # cxl/pci: Store memory capacity values # cxl/pci: Simplify register setup # cxl/pci: Ignore unknown register block types # cxl/core: Move memdev management to core # ... # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux-ld --version # < git log --format=%s --max-count=1 70868a180501d17fea58153c649d56bc18435315 # < make -s -j 32 ARCH=s390 O=/kisskb/build/linus_s390-allyesconfig_s390x-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux- allyesconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_KCOV=n # Added to kconfig # < make -s -j 32 ARCH=s390 O=/kisskb/build/linus_s390-allyesconfig_s390x-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux- help # make -s -j 32 ARCH=s390 O=/kisskb/build/linus_s390-allyesconfig_s390x-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux- olddefconfig # make -s -j 32 ARCH=s390 O=/kisskb/build/linus_s390-allyesconfig_s390x-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux- In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/tm.h:21, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/latent_entropy_plugin.c:78: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/config/s390/s390.h:836:20: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), "\t.set\t.,.+"HOST_WIDE_INT_PRINT_UNSIGNED"\n", (SIZE)) ^ In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/tm.h:23, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/latent_entropy_plugin.c:78: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/config/elfos.h:102:21: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), "%s"HOST_WIDE_INT_PRINT_UNSIGNED"\n",\ ^ /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/config/elfos.h:170:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/tm.h:21, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/structleak_plugin.c:32: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/config/s390/s390.h:836:20: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), "\t.set\t.,.+"HOST_WIDE_INT_PRINT_UNSIGNED"\n", (SIZE)) ^ In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/tm.h:23, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/structleak_plugin.c:32: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/config/elfos.h:102:21: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), "%s"HOST_WIDE_INT_PRINT_UNSIGNED"\n",\ ^ /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/config/elfos.h:170:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/tm.h:36, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/latent_entropy_plugin.c:78: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/defaults.h:126:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/tm.h:36, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/structleak_plugin.c:32: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/defaults.h:126:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/tm.h:21, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/randomize_layout_plugin.c:19: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/config/s390/s390.h:836:20: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), "\t.set\t.,.+"HOST_WIDE_INT_PRINT_UNSIGNED"\n", (SIZE)) ^ In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/tm.h:23, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/randomize_layout_plugin.c:19: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/config/elfos.h:102:21: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), "%s"HOST_WIDE_INT_PRINT_UNSIGNED"\n",\ ^ /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/config/elfos.h:170:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/tm.h:36, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/randomize_layout_plugin.c:19: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/../lib/gcc/s390-linux/4.9.4/plugin/include/defaults.h:126:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ cc1plus: warning: unrecognized command line option '-Wno-format-diag' cc1plus: warning: unrecognized command line option '-Wno-format-diag' cc1plus: warning: unrecognized command line option '-Wno-format-diag' In file included from /kisskb/src/mm/damon/vaddr.c:672:0: /kisskb/src/mm/damon/vaddr-test.h: In function 'damon_test_three_regions_in_vmas': /kisskb/src/mm/damon/vaddr-test.h:75:9: error: missing braces around initializer [-Werror=missing-braces] struct damon_addr_range regions[3] = {0,}; ^ /kisskb/src/mm/damon/vaddr-test.h:75:9: error: (near initialization for 'regions[0]') [-Werror=missing-braces] cc1: all warnings being treated as errors /kisskb/src/arch/s390/kernel/syscall.c: In function '__do_syscall': /kisskb/src/arch/s390/kernel/syscall.c:168:1: error: '__do_syscall' uses dynamic stack allocation [-Werror] } ^ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:277: mm/damon/vaddr.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:540: mm/damon] Error 2 make[1]: *** [/kisskb/src/Makefile:1874: mm] Error 2 make[1]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:277: arch/s390/kernel/syscall.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: arch/s390/kernel] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1874: arch/s390] Error 2 /kisskb/src/net/sched/sch_frag.c: In function 'sch_fragment': /kisskb/src/net/sched/sch_frag.c:93:10: error: missing braces around initializer [-Werror=missing-braces] struct rtable sch_frag_rt = { 0 }; ^ /kisskb/src/net/sched/sch_frag.c:93:10: error: (near initialization for 'sch_frag_rt.dst') [-Werror=missing-braces] cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:277: net/sched/sch_frag.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: net/sched] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1874: net] Error 2 /kisskb/src/security/landlock/ruleset.c: In function 'insert_rule': /kisskb/src/security/landlock/ruleset.c:196:34: error: passing argument 2 of 'create_rule' from incompatible pointer type [-Werror] new_rule = create_rule(object, &this->layers, this->num_layers, ^ /kisskb/src/security/landlock/ruleset.c:69:30: note: expected 'const struct landlock_layer (* const)[]' but argument is of type 'struct landlock_layer (*)[]' static struct landlock_rule *create_rule( ^ /kisskb/src/security/landlock/ruleset.c: In function 'landlock_insert_rule': /kisskb/src/security/landlock/ruleset.c:240:38: error: passing argument 3 of 'insert_rule' from incompatible pointer type [-Werror] return insert_rule(ruleset, object, &layers, ARRAY_SIZE(layers)); ^ /kisskb/src/security/landlock/ruleset.c:144:12: note: expected 'const struct landlock_layer (* const)[]' but argument is of type 'struct landlock_layer (*)[1]' static int insert_rule(struct landlock_ruleset *const ruleset, ^ /kisskb/src/security/landlock/ruleset.c: In function 'merge_ruleset': /kisskb/src/security/landlock/ruleset.c:300:47: error: passing argument 3 of 'insert_rule' from incompatible pointer type [-Werror] err = insert_rule(dst, walker_rule->object, &layers, ^ /kisskb/src/security/landlock/ruleset.c:144:12: note: expected 'const struct landlock_layer (* const)[]' but argument is of type 'struct landlock_layer (*)[1]' static int insert_rule(struct landlock_ruleset *const ruleset, ^ /kisskb/src/security/landlock/ruleset.c: In function 'inherit_ruleset': /kisskb/src/security/landlock/ruleset.c:330:5: error: passing argument 3 of 'insert_rule' from incompatible pointer type [-Werror] &walker_rule->layers, walker_rule->num_layers); ^ /kisskb/src/security/landlock/ruleset.c:144:12: note: expected 'const struct landlock_layer (* const)[]' but argument is of type 'struct landlock_layer (*)[]' static int insert_rule(struct landlock_ruleset *const ruleset, ^ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:277: security/landlock/ruleset.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: security/landlock] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/kernel/dma/debug.c: In function 'debug_dma_unmap_page': /kisskb/src/kernel/dma/debug.c:1279:1: error: 'debug_dma_unmap_page' uses dynamic stack allocation [-Werror] } ^ /kisskb/src/kernel/dma/debug.c: In function 'debug_dma_unmap_sg': /kisskb/src/kernel/dma/debug.c:1367:1: error: 'debug_dma_unmap_sg' uses dynamic stack allocation [-Werror] } ^ /kisskb/src/kernel/dma/debug.c: In function 'debug_dma_free_coherent': /kisskb/src/kernel/dma/debug.c:1428:1: error: 'debug_dma_free_coherent' uses dynamic stack allocation [-Werror] } ^ /kisskb/src/kernel/dma/debug.c: In function 'debug_dma_unmap_resource': /kisskb/src/kernel/dma/debug.c:1469:1: error: 'debug_dma_unmap_resource' uses dynamic stack allocation [-Werror] } ^ /kisskb/src/kernel/dma/debug.c: In function 'debug_dma_sync_single_for_cpu': /kisskb/src/kernel/dma/debug.c:1487:1: error: 'debug_dma_sync_single_for_cpu' uses dynamic stack allocation [-Werror] } ^ /kisskb/src/kernel/dma/debug.c: In function 'debug_dma_sync_single_for_device': /kisskb/src/kernel/dma/debug.c:1506:1: error: 'debug_dma_sync_single_for_device' uses dynamic stack allocation [-Werror] } ^ /kisskb/src/kernel/dma/debug.c: In function 'debug_dma_sync_sg_for_cpu': /kisskb/src/kernel/dma/debug.c:1538:1: error: 'debug_dma_sync_sg_for_cpu' uses dynamic stack allocation [-Werror] } ^ /kisskb/src/kernel/dma/debug.c: In function 'debug_dma_sync_sg_for_device': /kisskb/src/kernel/dma/debug.c:1569:1: error: 'debug_dma_sync_sg_for_device' uses dynamic stack allocation [-Werror] } ^ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:277: kernel/dma/debug.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: kernel/dma] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1874: security] Error 2 make[1]: *** [/kisskb/src/Makefile:1874: kernel] Error 2 /kisskb/src/fs/nfs/super.c: In function 'nfs_show_stats': /kisskb/src/fs/nfs/super.c:721:1: error: 'nfs_show_stats' uses dynamic stack allocation [-Werror] } ^ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:277: fs/nfs/super.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: fs/nfs] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/fs/cifs/connect.c: In function 'cifs_mount': /kisskb/src/fs/cifs/connect.c:3466:2: error: missing braces around initializer [-Werror=missing-braces] uuid_t mount_id = {0}; ^ /kisskb/src/fs/cifs/connect.c:3466:2: error: (near initialization for 'mount_id.b') [-Werror=missing-braces] cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:277: fs/cifs/connect.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: fs/cifs] Error 2 make[1]: *** [/kisskb/src/Makefile:1874: fs] Error 2 /kisskb/src/drivers/virtio/virtio_vdpa.c: In function 'virtio_vdpa_setup_vq': /kisskb/src/drivers/virtio/virtio_vdpa.c:146:9: error: missing braces around initializer [-Werror=missing-braces] struct vdpa_vq_state state = {0}; ^ /kisskb/src/drivers/virtio/virtio_vdpa.c:146:9: error: (near initialization for 'state.') [-Werror=missing-braces] cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/virtio/virtio_vdpa.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/virtio] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/soc/qcom/pdr_interface.c: In function 'pdr_restart_pd': /kisskb/src/drivers/soc/qcom/pdr_interface.c:572:9: error: missing braces around initializer [-Werror=missing-braces] struct servreg_restart_pd_req req = { 0 }; ^ /kisskb/src/drivers/soc/qcom/pdr_interface.c:572:9: error: (near initialization for 'req.service_path') [-Werror=missing-braces] cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/soc/qcom/pdr_interface.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/soc/qcom] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/soc] Error 2 /kisskb/src/drivers/clk/xilinx/xlnx_vcu.c: In function 'xvcu_register_clock_provider': /kisskb/src/drivers/clk/xilinx/xlnx_vcu.c:524:9: error: missing braces around initializer [-Werror=missing-braces] struct clk_parent_data parent_data[2] = { 0 }; ^ /kisskb/src/drivers/clk/xilinx/xlnx_vcu.c:524:9: error: (near initialization for 'parent_data[0]') [-Werror=missing-braces] cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/clk/xilinx/xlnx_vcu.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/clk/xilinx] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/clk] Error 2 make[1]: *** [/kisskb/src/Makefile:1874: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=s390 O=/kisskb/build/linus_s390-allyesconfig_s390x-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_s390-allyesconfig_s390x-gcc4.9 # Build took: 0:02:03.098984