* [GIT PULL] s390 updates for 6.6 merge window
@ 2023-08-27 20:30 Heiko Carstens
2023-08-27 20:34 ` Heiko Carstens
2023-08-29 0:46 ` pr-tracker-bot
0 siblings, 2 replies; 6+ messages in thread
From: Heiko Carstens @ 2023-08-27 20:30 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Vasily Gorbik, Alexander Gordeev, linux-s390, linux-kernel
Hi Linus,
please pull s390 updates for the 6.6 merge window.
There will be a merge conflict with Andrew's mm-nonmm-stable tree.
Since the diff of the merge resolution is quite large I'm going to
reply to this mail.
Thanks,
Heiko
The following changes since commit 6eaae198076080886b9e7d57f4ae06fa782f90ef:
Linux 6.5-rc3 (2023-07-23 15:24:10 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-6.6-1
for you to fetch changes up to dedf98dd1cfb61cfc74be9248b90a49b42c6dead:
s390/pci: use builtin_misc_device macro to simplify the code (2023-08-23 14:37:42 +0200)
----------------------------------------------------------------
s390 updates for 6.6 merge window
- Add vfio-ap support to pass-through crypto devices to secure execution
guests
- Add API ordinal 6 support to zcrypt_ep11misc device drive, which is
required to handle key generate and key derive (e.g. secure key to
protected key) correctly
- Add missing secure/has_secure sysfs files for the case where it is not
possible to figure where a system has been booted from. Existing user
space relies on that these files are always present
- Fix DCSS block device driver list corruption, caused by incorrect
error handling
- Convert virt_to_pfn() and pfn_to_virt() from defines to static inline
functions to enforce type checking
- Cleanups, improvements, and minor fixes to the kernel mapping setup
- Fix various virtual vs physical address confusions
- Move pfault code to separate file, since it has nothing to do with
regular fault handling
- Move s390 documentation to Documentation/arch/ like it has been done
for other architectures already
- Add HAVE_FUNCTION_GRAPH_RETVAL support
- Factor out the s390_hypfs filesystem and add a new config option for
it. The filesystem is deprecated and as soon as all users are gone it
can be removed some time in the not so near future
- Remove support for old CEX2 and CEX3 crypto cards from zcrypt device
driver
- Add support for user-defined certificates: receive user-defined
certificates with a diagnose call and provide them via 'cert_store'
keyring to user space
- Couple of other small fixes and improvements all over the place
----------------------------------------------------------------
Alexander Gordeev (12):
s390/kexec: make machine_kexec() depend on CONFIG_KEXEC_CORE
s390/dcssblk: use IS_ALIGNED() for alignment checks
s390/dcssblk: fix virtual vs physical address confusion
s390/mm: remove redundant check against VMEM_MAX_PHYS
s390/mm: rework arch_get_mappable_range() callback
s390/extmem: improve reporting of -ERANGE error
s390/mm: get rid of VMEM_MAX_PHYS macro
s390/boot: cleanup number of page table levels setup
s390/mm: define Real Memory Copy size and mask macros
s390/boot: account Real Memory Copy and Lowcore areas
s390/boot: fix multi-line comments style
s390/ipl: fix virtual vs physical address confusion
Anastasia Eskova (1):
s390: add support for user-defined certificates
Christophe JAILLET (1):
s390/ebcdic: fix typo in comment
Costa Shulyupin (1):
docs: move s390 under arch
Gerald Schaefer (1):
s390/dcssblk: fix kernel crash with list_add corruption
Harald Freudenberger (1):
s390/zcrypt: remove CEX2 and CEX3 device drivers
Heiko Carstens (16):
s390/diag: handle diag 204 subcode 4 address correctly
s390/sthyi: enforce 4k alignment of vmalloc'ed area
s390/hypfs: simplify memory allocation
s390/hypfs: remove open-coded PTR_ALIGN()
s390/hypfs: factor out filesystem code
s390/diag: fix diagnose 8c description
s390/ftrace: use la instead of aghik in return_to_handler()
s390/defconfigs: set CONFIG_FUNCTION_GRAPH_RETVAL=y
s390/mm: move pfault code to own C file
s390/pfault: use UL instead of ULL
s390/pfault: remove not needed packed and aligned attributes
s390/pfault: use early_param() instead if __setup()
s390/pfault: cleanup inline assemblies
s390/pfault: use consistent comment style
s390/smp: ensure global control register contents are in sync
Merge branch 'vfio-ap' into features
Holger Dengler (8):
s390/pkey: fix/harmonize internal keyblob headers
s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_GENSECK2 IOCTL
s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_CLR2SECK2 IOCTL
s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_KBLOB2PROTK[23]
s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_VERIFYKEY2 IOCTL
s390/pkey: fix PKEY_TYPE_EP11_AES handling for sysfs attributes
s390/paes: fix PKEY_TYPE_EP11_AES handling for secure keyblobs
s390/zcrypt_ep11misc: support API ordinal 6 with empty pin-blob
Janosch Frank (1):
s390/uv: export uv_pin_shared for direct usage
Justin Stitt (1):
s390/ipl: refactor deprecated strncpy
Li Zetao (1):
s390/pci: use builtin_misc_device macro to simplify the code
Linus Walleij (1):
s390/mm: make virt_to_pfn() a static inline
Masahiro Yamada (4):
s390: use obj-y to descend into drivers/s390/
s390: remove unneeded #include <asm/export.h>
s390: replace #include <asm/export.h> with #include <linux/export.h>
s390: remove <asm/export.h>
Sven Schnelle (6):
s390/ftrace: enable HAVE_FUNCTION_GRAPH_RETVAL
s390/hypfs: stop using ENOSYS error code
s390/tracing: pass struct ftrace_regs to ftrace_trace_function
s390/cert_store: select CRYPTO_LIB_SHA256
s390/ipl: add missing secure/has_secure file to ipl type 'unknown'
s390/ipl: add common ipl parameter attribute group
Tony Krowiak (11):
s390/vfio-ap: no need to check the 'E' and 'I' bits in APQSW after TAPQ
s390/vfio-ap: clean up irq resources if possible
s390/vfio-ap: wait for response code 05 to clear on queue reset
s390/vfio-ap: allow deconfigured queue to be passed through to a guest
s390/vfio-ap: remove upper limit on wait for queue reset to complete
s390/vfio-ap: store entire AP queue status word with the queue object
s390/vfio-ap: use work struct to verify queue reset
s390/vfio-ap: handle queue state change in progress on reset
s390/vfio-ap: check for TAPQ response codes 0x35 and 0x36
KVM: s390: export kvm_s390_pv*_is_protected functions
s390/vfio-ap: make sure nib is shared
Yang Yingliang (1):
s390/cert_store: fix error return code in fill_cs_keyring()
Documentation/admin-guide/kernel-parameters.txt | 4 +-
Documentation/arch/index.rst | 2 +-
Documentation/{ => arch}/s390/3270.ChangeLog | 0
Documentation/{ => arch}/s390/3270.rst | 4 +-
Documentation/{ => arch}/s390/cds.rst | 2 +-
Documentation/{ => arch}/s390/common_io.rst | 2 +-
Documentation/{ => arch}/s390/config3270.sh | 0
Documentation/{ => arch}/s390/driver-model.rst | 0
Documentation/{ => arch}/s390/features.rst | 0
Documentation/{ => arch}/s390/index.rst | 0
Documentation/{ => arch}/s390/monreader.rst | 0
Documentation/{ => arch}/s390/pci.rst | 2 +-
Documentation/{ => arch}/s390/qeth.rst | 0
Documentation/{ => arch}/s390/s390dbf.rst | 0
Documentation/{ => arch}/s390/text_files.rst | 0
Documentation/{ => arch}/s390/vfio-ap-locking.rst | 0
Documentation/{ => arch}/s390/vfio-ap.rst | 0
Documentation/{ => arch}/s390/vfio-ccw.rst | 2 +-
Documentation/{ => arch}/s390/zfcpdump.rst | 0
Documentation/driver-api/s390-drivers.rst | 4 +-
MAINTAINERS | 8 +-
arch/s390/Kbuild | 2 +-
arch/s390/Kconfig | 31 +-
arch/s390/Makefile | 1 -
arch/s390/boot/startup.c | 22 +-
arch/s390/configs/debug_defconfig | 1 +
arch/s390/configs/defconfig | 1 +
arch/s390/crypto/paes_s390.c | 2 +-
arch/s390/hypfs/Makefile | 11 +-
arch/s390/hypfs/hypfs.h | 10 +-
arch/s390/hypfs/hypfs_dbfs.c | 31 +-
arch/s390/hypfs/hypfs_diag.c | 453 +-----------
arch/s390/hypfs/hypfs_diag.h | 35 +
arch/s390/hypfs/hypfs_diag_fs.c | 393 +++++++++++
arch/s390/hypfs/hypfs_vm.c | 175 +----
arch/s390/hypfs/hypfs_vm.h | 50 ++
arch/s390/hypfs/hypfs_vm_fs.c | 139 ++++
arch/s390/hypfs/inode.c | 35 +-
arch/s390/include/asm/Kbuild | 1 -
arch/s390/include/asm/debug.h | 4 +-
arch/s390/include/asm/diag.h | 3 +
arch/s390/include/asm/ftrace.h | 17 +
arch/s390/include/asm/kfence.h | 2 +-
arch/s390/include/asm/kvm_host.h | 3 +
arch/s390/include/asm/maccess.h | 3 +
arch/s390/include/asm/page.h | 12 +-
arch/s390/include/asm/pfault.h | 26 +
arch/s390/include/asm/pgtable.h | 2 -
arch/s390/include/asm/sclp.h | 1 +
arch/s390/include/asm/setup.h | 9 +-
arch/s390/include/asm/uv.h | 6 +
arch/s390/include/uapi/asm/pkey.h | 2 +-
arch/s390/kernel/Makefile | 7 +-
arch/s390/kernel/asm-offsets.c | 9 +
arch/s390/kernel/cert_store.c | 811 ++++++++++++++++++++++
arch/s390/kernel/diag.c | 25 +-
arch/s390/kernel/ebcdic.c | 2 +-
arch/s390/kernel/entry.S | 2 +-
arch/s390/kernel/ipl.c | 32 +-
arch/s390/kernel/machine_kexec.c | 1 +
arch/s390/kernel/machine_kexec_file.c | 4 +-
arch/s390/kernel/mcount.S | 65 +-
arch/s390/kernel/setup.c | 3 +-
arch/s390/kernel/smp.c | 16 +-
arch/s390/kernel/sthyi.c | 4 +-
arch/s390/kernel/uv.c | 3 +-
arch/s390/kvm/kvm-s390.h | 12 -
arch/s390/kvm/pv.c | 14 +
arch/s390/lib/mem.S | 2 +-
arch/s390/lib/tishift.S | 2 +-
arch/s390/mm/Makefile | 1 +
arch/s390/mm/cmm.c | 2 +-
arch/s390/mm/dump_pagetables.c | 2 +-
arch/s390/mm/extmem.c | 9 +-
arch/s390/mm/fault.c | 228 ------
arch/s390/mm/maccess.c | 7 +-
arch/s390/mm/pfault.c | 248 +++++++
arch/s390/mm/vmem.c | 4 +-
arch/s390/pci/pci_clp.c | 7 +-
drivers/Makefile | 2 +
drivers/crypto/Kconfig | 7 +-
drivers/s390/block/dcssblk.c | 26 +-
drivers/s390/block/scm_blk.c | 2 +-
drivers/s390/char/sclp_cmd.c | 4 -
drivers/s390/char/sclp_early.c | 1 +
drivers/s390/char/vmcp.c | 2 +-
drivers/s390/char/zcore.c | 2 +-
drivers/s390/crypto/Makefile | 2 +-
drivers/s390/crypto/ap_bus.c | 34 +-
drivers/s390/crypto/ap_bus.h | 20 +-
drivers/s390/crypto/ap_queue.c | 47 +-
drivers/s390/crypto/pkey_api.c | 119 +++-
drivers/s390/crypto/vfio_ap_ops.c | 172 +++--
drivers/s390/crypto/vfio_ap_private.h | 6 +-
drivers/s390/crypto/zcrypt_cex2a.c | 227 ------
drivers/s390/crypto/zcrypt_cex2a.h | 134 ----
drivers/s390/crypto/zcrypt_cex2c.c | 421 -----------
drivers/s390/crypto/zcrypt_cex2c.h | 18 -
drivers/s390/crypto/zcrypt_ep11misc.c | 347 ++++++---
drivers/s390/crypto/zcrypt_ep11misc.h | 24 +-
drivers/s390/crypto/zcrypt_msgtype50.c | 64 +-
drivers/s390/crypto/zcrypt_msgtype50.h | 3 +-
drivers/s390/crypto/zcrypt_msgtype6.c | 14 +-
security/integrity/platform_certs/load_ipl_s390.c | 4 +-
104 files changed, 2580 insertions(+), 2157 deletions(-)
rename Documentation/{ => arch}/s390/3270.ChangeLog (100%)
rename Documentation/{ => arch}/s390/3270.rst (99%)
rename Documentation/{ => arch}/s390/cds.rst (99%)
rename Documentation/{ => arch}/s390/common_io.rst (98%)
rename Documentation/{ => arch}/s390/config3270.sh (100%)
rename Documentation/{ => arch}/s390/driver-model.rst (100%)
rename Documentation/{ => arch}/s390/features.rst (100%)
rename Documentation/{ => arch}/s390/index.rst (100%)
rename Documentation/{ => arch}/s390/monreader.rst (100%)
rename Documentation/{ => arch}/s390/pci.rst (99%)
rename Documentation/{ => arch}/s390/qeth.rst (100%)
rename Documentation/{ => arch}/s390/s390dbf.rst (100%)
rename Documentation/{ => arch}/s390/text_files.rst (100%)
rename Documentation/{ => arch}/s390/vfio-ap-locking.rst (100%)
rename Documentation/{ => arch}/s390/vfio-ap.rst (100%)
rename Documentation/{ => arch}/s390/vfio-ccw.rst (99%)
rename Documentation/{ => arch}/s390/zfcpdump.rst (100%)
create mode 100644 arch/s390/hypfs/hypfs_diag.h
create mode 100644 arch/s390/hypfs/hypfs_diag_fs.c
create mode 100644 arch/s390/hypfs/hypfs_vm.h
create mode 100644 arch/s390/hypfs/hypfs_vm_fs.c
create mode 100644 arch/s390/include/asm/pfault.h
create mode 100644 arch/s390/kernel/cert_store.c
create mode 100644 arch/s390/mm/pfault.c
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [GIT PULL] s390 updates for 6.6 merge window 2023-08-27 20:30 [GIT PULL] s390 updates for 6.6 merge window Heiko Carstens @ 2023-08-27 20:34 ` Heiko Carstens 2023-08-27 23:42 ` Stephen Rothwell 2023-08-29 0:46 ` pr-tracker-bot 1 sibling, 1 reply; 6+ messages in thread From: Heiko Carstens @ 2023-08-27 20:34 UTC (permalink / raw) To: Linus Torvalds; +Cc: Vasily Gorbik, Alexander Gordeev, linux-s390, linux-kernel On Sun, Aug 27, 2023 at 10:31:00PM +0200, Heiko Carstens wrote: > Hi Linus, > > please pull s390 updates for the 6.6 merge window. > > There will be a merge conflict with Andrew's mm-nonmm-stable tree. > Since the diff of the merge resolution is quite large I'm going to > reply to this mail. Maybe I'm doing something wrong, but below is the rather large diff of the merge commit, using "git diff HEAD HEAD^@", where HEAD is the merge commit. diff --cc arch/s390/Kconfig index 18bf754e1fad,4d011f7c26e5..42446cbb53e2 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@@ -245,6 -245,25 +246,25 @@@ config PGTABLE_LEVEL source "kernel/livepatch/Kconfig" + config ARCH_SUPPORTS_KEXEC + def_bool y + + config ARCH_SUPPORTS_KEXEC_FILE + def_bool CRYPTO && CRYPTO_SHA256 && CRYPTO_SHA256_S390 + + config ARCH_SUPPORTS_KEXEC_SIG + def_bool MODULE_SIG_FORMAT + + config ARCH_SUPPORTS_KEXEC_PURGATORY + def_bool KEXEC_FILE + + config ARCH_SUPPORTS_CRASH_DUMP + def_bool y + help - Refer to <file:Documentation/s390/zfcpdump.rst> for more details on this. ++ Refer to <file:Documentation/arch/s390/zfcpdump.rst> for more details on this. + This option also enables s390 zfcpdump. - See also <file:Documentation/s390/zfcpdump.rst> ++ See also <file:Documentation/arch/s390/zfcpdump.rst> + menu "Processor type and features" config HAVE_MARCH_Z10_FEATURES @@@ -483,47 -502,6 +503,17 @@@ config SCHED_TOPOLOG source "kernel/Kconfig.hz" - config KEXEC - def_bool y - select KEXEC_CORE - - config KEXEC_FILE - bool "kexec file based system call" - select KEXEC_CORE - depends on CRYPTO - depends on CRYPTO_SHA256 - depends on CRYPTO_SHA256_S390 - help - Enable the kexec file based system call. In contrast to the normal - kexec system call this system call takes file descriptors for the - kernel and initramfs as arguments. - - config ARCH_HAS_KEXEC_PURGATORY - def_bool y - depends on KEXEC_FILE - - config KEXEC_SIG - bool "Verify kernel signature during kexec_file_load() syscall" - depends on KEXEC_FILE && MODULE_SIG_FORMAT - help - This option makes kernel signature verification mandatory for - the kexec_file_load() syscall. - - In addition to that option, you need to enable signature - verification for the corresponding kernel image type being - loaded in order for this to work. - +config CERT_STORE + bool "Get user certificates via DIAG320" + depends on KEYS + select CRYPTO_LIB_SHA256 + help + Enable this option if you want to access user-provided secure boot + certificates via DIAG 0x320. + + These certificates will be made available via the keyring named + 'cert_store'. + config KERNEL_NOBP def_bool n prompt "Enable modified branch prediction for the kernel by default" diff --cc kernel/Kconfig.kexec index 000000000000,9bfe68fe9676..7aff28ded2f4 mode 000000,100644..100644 --- a/kernel/Kconfig.kexec +++ b/kernel/Kconfig.kexec @@@ -1,0 -1,150 +1,150 @@@ + # SPDX-License-Identifier: GPL-2.0-only + + menu "Kexec and crash features" + + config CRASH_CORE + bool + + config KEXEC_CORE + select CRASH_CORE + bool + + config KEXEC_ELF + bool + + config HAVE_IMA_KEXEC + bool + + config KEXEC + bool "Enable kexec system call" + depends on ARCH_SUPPORTS_KEXEC + select KEXEC_CORE + help + kexec is a system call that implements the ability to shutdown your + current kernel, and to start another kernel. It is like a reboot + but it is independent of the system firmware. And like a reboot + you can start any kernel with it, not just Linux. + + The name comes from the similarity to the exec system call. + + It is an ongoing process to be certain the hardware in a machine + is properly shutdown, so do not be surprised if this code does not + initially work for you. As of this writing the exact hardware + interface is strongly in flux, so no good recommendation can be + made. + + config KEXEC_FILE + bool "Enable kexec file based system call" + depends on ARCH_SUPPORTS_KEXEC_FILE + select KEXEC_CORE + help + This is new version of kexec system call. This system call is + file based and takes file descriptors as system call argument + for kernel and initramfs as opposed to list of segments as + accepted by kexec system call. + + config KEXEC_SIG + bool "Verify kernel signature during kexec_file_load() syscall" + depends on ARCH_SUPPORTS_KEXEC_SIG + depends on KEXEC_FILE + help + This option makes the kexec_file_load() syscall check for a valid + signature of the kernel image. The image can still be loaded without + a valid signature unless you also enable KEXEC_SIG_FORCE, though if + there's a signature that we can check, then it must be valid. + + In addition to this option, you need to enable signature + verification for the corresponding kernel image type being + loaded in order for this to work. + + config KEXEC_SIG_FORCE + bool "Require a valid signature in kexec_file_load() syscall" + depends on ARCH_SUPPORTS_KEXEC_SIG_FORCE + depends on KEXEC_SIG + help + This option makes kernel signature verification mandatory for + the kexec_file_load() syscall. + + config KEXEC_IMAGE_VERIFY_SIG + bool "Enable Image signature verification support (ARM)" + default ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG + depends on ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG + depends on KEXEC_SIG + depends on EFI && SIGNED_PE_FILE_VERIFICATION + help + Enable Image signature verification support. + + config KEXEC_BZIMAGE_VERIFY_SIG + bool "Enable bzImage signature verification support" + depends on ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG + depends on KEXEC_SIG + depends on SIGNED_PE_FILE_VERIFICATION + select SYSTEM_TRUSTED_KEYRING + help + Enable bzImage signature verification support. + + config KEXEC_JUMP + bool "kexec jump" + depends on ARCH_SUPPORTS_KEXEC_JUMP + depends on KEXEC && HIBERNATION + help + Jump between original kernel and kexeced kernel and invoke + code in physical address mode via KEXEC + + config CRASH_DUMP + bool "kernel crash dumps" + depends on ARCH_SUPPORTS_CRASH_DUMP + depends on ARCH_SUPPORTS_KEXEC + select CRASH_CORE + select KEXEC_CORE + select KEXEC + help + Generate crash dump after being started by kexec. + This should be normally only set in special crash dump kernels + which are loaded in the main kernel with kexec-tools into + a specially reserved region and then later executed after + a crash by kdump/kexec. The crash dump kernel must be compiled + to a memory address not used by the main kernel or BIOS using + PHYSICAL_START, or it must be built as a relocatable image + (CONFIG_RELOCATABLE=y). + For more details see Documentation/admin-guide/kdump/kdump.rst + + For s390, this option also enables zfcpdump. - See also <file:Documentation/s390/zfcpdump.rst> ++ See also <file:Documentation/arch/s390/zfcpdump.rst> + + config CRASH_HOTPLUG + bool "Update the crash elfcorehdr on system configuration changes" + default y + depends on CRASH_DUMP && (HOTPLUG_CPU || MEMORY_HOTPLUG) + depends on ARCH_SUPPORTS_CRASH_HOTPLUG + help + Enable direct update to the crash elfcorehdr (which contains + the list of CPUs and memory regions to be dumped upon a crash) + in response to hot plug/unplug or online/offline of CPUs or + memory. This is a much more advanced approach than userspace + attempting that. + + If unsure, say Y. + + config CRASH_MAX_MEMORY_RANGES + int "Specify the maximum number of memory regions for the elfcorehdr" + default 8192 + depends on CRASH_HOTPLUG + help + For the kexec_file_load() syscall path, specify the maximum number of + memory regions that the elfcorehdr buffer/segment can accommodate. + These regions are obtained via walk_system_ram_res(); eg. the + 'System RAM' entries in /proc/iomem. + This value is combined with NR_CPUS_DEFAULT and multiplied by + sizeof(Elf64_Phdr) to determine the final elfcorehdr memory buffer/ + segment size. + The value 8192, for example, covers a (sparsely populated) 1TiB system + consisting of 128MiB memblocks, while resulting in an elfcorehdr + memory buffer/segment size under 1MiB. This represents a sane choice + to accommodate both baremetal and virtual machine configurations. + + For the kexec_load() syscall path, CRASH_MAX_MEMORY_RANGES is part of + the computation behind the value provided through the + /sys/kernel/crash_elfcorehdr_size attribute. + + endmenu ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] s390 updates for 6.6 merge window 2023-08-27 20:34 ` Heiko Carstens @ 2023-08-27 23:42 ` Stephen Rothwell 2023-08-28 1:10 ` Stephen Rothwell 2023-08-28 8:31 ` Heiko Carstens 0 siblings, 2 replies; 6+ messages in thread From: Stephen Rothwell @ 2023-08-27 23:42 UTC (permalink / raw) To: Heiko Carstens Cc: Linus Torvalds, Vasily Gorbik, Alexander Gordeev, linux-s390, linux-kernel [-- Attachment #1: Type: text/plain, Size: 575 bytes --] Hi Heiko, On Sun, 27 Aug 2023 22:34:01 +0200 Heiko Carstens <hca@linux.ibm.com> wrote: > > On Sun, Aug 27, 2023 at 10:31:00PM +0200, Heiko Carstens wrote: > > Maybe I'm doing something wrong, but below is the rather large diff > of the merge commit, using "git diff HEAD HEAD^@", where HEAD is the > merge commit. Something weird there. I just see the arch/s390/Kconfig part (I use git diff-tree <merge commit>). What did you merge? I can't see any commits affecting kernel/Kconfig.kexec in the s390 branch in linux-next. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 484 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] s390 updates for 6.6 merge window 2023-08-27 23:42 ` Stephen Rothwell @ 2023-08-28 1:10 ` Stephen Rothwell 2023-08-28 8:31 ` Heiko Carstens 1 sibling, 0 replies; 6+ messages in thread From: Stephen Rothwell @ 2023-08-28 1:10 UTC (permalink / raw) To: Heiko Carstens Cc: Linus Torvalds, Vasily Gorbik, Alexander Gordeev, linux-s390, linux-kernel [-- Attachment #1: Type: text/plain, Size: 313 bytes --] Hi all, On Mon, 28 Aug 2023 09:42:28 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > >> Something weird there. I just see the arch/s390/Kconfig part (I use > git diff-tree <merge commit>). What did you merge? Actually I use "git diff-tree --cc <merge commit>" -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] s390 updates for 6.6 merge window 2023-08-27 23:42 ` Stephen Rothwell 2023-08-28 1:10 ` Stephen Rothwell @ 2023-08-28 8:31 ` Heiko Carstens 1 sibling, 0 replies; 6+ messages in thread From: Heiko Carstens @ 2023-08-28 8:31 UTC (permalink / raw) To: Stephen Rothwell Cc: Linus Torvalds, Vasily Gorbik, Alexander Gordeev, linux-s390, linux-kernel On Mon, Aug 28, 2023 at 09:42:28AM +1000, Stephen Rothwell wrote: > Hi Heiko, > > On Sun, 27 Aug 2023 22:34:01 +0200 Heiko Carstens <hca@linux.ibm.com> wrote: > > > > On Sun, Aug 27, 2023 at 10:31:00PM +0200, Heiko Carstens wrote: > > > > Maybe I'm doing something wrong, but below is the rather large diff > > of the merge commit, using "git diff HEAD HEAD^@", where HEAD is the > > merge commit. > > Something weird there. I just see the arch/s390/Kconfig part (I use > git diff-tree <merge commit>). What did you merge? > > I can't see any commits affecting kernel/Kconfig.kexec in the s390 > branch in linux-next. There is logical conflict between commit 37002bc6b603 ("docs: move s390 under arch") from the s390 tree: git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux tags/s390-6.6-1 and commit 89cde455915f ("kexec: consolidate kexec and crash options into kernel/Kconfig.kexec") from Andrew's tree: git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable The commit in Andrew's tree introduces kernel/Kconfic.kexec and uses the old location for Documentation (which is correct for Andrew's tree). So when merging the s390 tree and Andrew's tree into Linus' tree that should be fixed as well (btw.: this is not "fixed" in linux-next). So I guess the size of the merge commit diff is simply a result of kernel/Kconfig.exec not being present in both trees and being modified with the merge, and therefore the complete file is part of the diff. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] s390 updates for 6.6 merge window 2023-08-27 20:30 [GIT PULL] s390 updates for 6.6 merge window Heiko Carstens 2023-08-27 20:34 ` Heiko Carstens @ 2023-08-29 0:46 ` pr-tracker-bot 1 sibling, 0 replies; 6+ messages in thread From: pr-tracker-bot @ 2023-08-29 0:46 UTC (permalink / raw) To: Heiko Carstens Cc: Linus Torvalds, Vasily Gorbik, Alexander Gordeev, linux-s390, linux-kernel The pull request you sent on Sun, 27 Aug 2023 22:30:58 +0200: > git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-6.6-1 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/e5b7ca09e9aa4d483ab84c5f2ba88f0cc7c66540 Thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-08-29 0:46 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-08-27 20:30 [GIT PULL] s390 updates for 6.6 merge window Heiko Carstens 2023-08-27 20:34 ` Heiko Carstens 2023-08-27 23:42 ` Stephen Rothwell 2023-08-28 1:10 ` Stephen Rothwell 2023-08-28 8:31 ` Heiko Carstens 2023-08-29 0:46 ` pr-tracker-bot
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).