LinuxLists.cc - linux-next: manual merge of the driver-core tree with the jc

2022-09-26 21:09:12

Subject: linux-next: manual merge of the driver-core tree with the jc_docs tree

Hi all,

Today's linux-next merge
Documentation/process/magic-number.rst
between commit:

32ba63d4b2e1a ("Doc
from the jc_docs tree and
82805818898dd ("Documentation: bd5926220ffe0 ("nbd:
from the driver-core tree
I fixed it up (see below) is now fixed as far as linux-next conflicts should be mentioned is submitted for merging. with the maintainer of the complex conflicts.

diff --cc Documentation/process/ma index 133ecfa106070,f420fa2d7f8b8. --- a/Documentation/process/magic-number.rst
+ NBD_REQUEST_MAGIC 0x12560953 + BAYCOM_MAGIC 0x19730510 ++>>>>>>> HDLCDRV_MAGIC 0x5ac6e778 - PCXX_MAGIC 0x5c6df104 KV_MAGIC 0x5f4b565f ++<<<<<<< +I810_STATE_MAGIC 0x63657373 +TRIDENT_STATE_MAGIC 0x63657373 +M3_CARD_MAGIC 0x646e6f50 +FW_HEADER_MAGIC 0x65726F66 +SLOT_MAGIC 0x67267321 +SLOT_MAGIC 0x67267322 +NBD_REPLY_MAGIC 0x67446698 +LO_MAGIC 0x68797548 +M3_STATE_MAGIC 0x734d724d +VMALLOC_MAGIC 0x87654320 +KMALLOC_MAGIC 0x87654321 +PWC_MAGIC 0x89DC10AB +ENI155_MAGIC 0xa54b872d ++=======
++>>>>>>> CODA_MAGIC 0xC0DAC0DA YAM_MAGIC 0xF10A7654 CCB_MAGIC 0xf2691ad2 diff --cc Documentation/translatio index 1b376fe087b54,4371f16836936. --- a/Documentation/translations/z +++ b/Documentation/translations/z @@@ -77,57 -66,11 +66,63 @@@ TTY_MAGIC MGSL_MAGIC 0x5401 TTY_DRIVER_MAGIC 0x5402 MGSLPC_MAGIC 0x5402 ++<<<<<<< +USB_SERIAL_MAGIC 0x6702 +FULL_DUPLEX_MAGIC 0x6969 +USB_BLUETOOTH_MAGIC 0x6d02 +RFCOMM_TTY_MAGIC 0x6d02 +USB_SERIAL_PORT_MAGIC 0x7301 +CG_MAGIC 0x00090255 +LSEMAGIC 0x05091998 +GDTIOCTL_MAGIC 0x06030f07 +RIEBL_MAGIC 0x09051990 +RED_MAGIC2 0x170fc2a5 +BAYCOM_MAGIC 0x19730510 +ISDN_X25IFACE_MAGIC 0x1e75a2b9 +ECP_MAGIC 0x21504345 +NBD_REQUEST_MAGIC 0x25609513 +LSOMAGIC 0x27091997 +LSMAGIC 0x2a3b4d2a +WANPIPE_MAGIC 0x414C4453 +CS_CARD_MAGIC 0x43525553 +LABELCL_MAGIC 0x4857434c +ISDN_ASYNC_MAGIC 0x49344C01 +CTC_ASYNC_MAGIC 0x49344C01 +ISDN_NET_MAGIC 0x49344C02 +SAVEKMSG_MAGIC2 0x4B4D5347 +CS_STATE_MAGIC 0x4c4f4749 +SLAB_C_MAGIC 0x4f17a36d +COW_MAGIC 0x4f4f4f4d +I810_CARD_MAGIC 0x5072696E +TRIDENT_CARD_MAGIC 0x5072696E +ROUTER_MAGIC 0x524d4157 +SAVEKMSG_MAGIC1 0x53415645 +GDA_MAGIC 0x58464552 +RED_MAGIC1 0x5a2cf071 +EEPROM_MAGIC_VALUE 0x5ab478d2 ++=======
+ NBD_REQUEST_MAGIC 0x12560953 + BAYCOM_MAGIC 0x19730510 ++>>>>>>> HDLCDRV_MAGIC 0x5ac6e778 - PCXX_MAGIC 0x5c6df104 KV_MAGIC 0x5f4b565f ++<<<<<<< +I810_STATE_MAGIC 0x63657373 +TRIDENT_STATE_MAGIC 0x63657373 +M3_CARD_MAGIC 0x646e6f50 +FW_HEADER_MAGIC 0x65726F66 +SLOT_MAGIC 0x67267321 +SLOT_MAGIC 0x67267322 +NBD_REPLY_MAGIC 0x67446698 +LO_MAGIC 0x68797548 +M3_STATE_MAGIC 0x734d724d +VMALLOC_MAGIC 0x87654320 +KMALLOC_MAGIC 0x87654321 +PWC_MAGIC 0x89DC10AB +ENI155_MAGIC 0xa54b872d ++=======
++>>>>>>> CODA_MAGIC 0xC0DAC0DA - DPMEM_MAGIC 0xc0ffee11 YAM_MAGIC 0xF10A7654 CCB_MAGIC 0xf2691ad2 QUEUE_MAGIC_FREE 0xf7e1c9a3 diff --cc Documentation/translatio index ff385a369c7b4,3e83f18b9c18e. --- a/Documentation/translations/z +++ b/Documentation/translations/z @@@ -80,57 -69,11 +69,63 @@@ TTY_MAGIC MGSL_MAGIC 0x5401 TTY_DRIVER_MAGIC 0x5402 MGSLPC_MAGIC 0x5402 ++<<<<<<< +USB_SERIAL_MAGIC 0x6702 +FULL_DUPLEX_MAGIC 0x6969 +USB_BLUETOOTH_MAGIC 0x6d02 +RFCOMM_TTY_MAGIC 0x6d02 +USB_SERIAL_PORT_MAGIC 0x7301 +CG_MAGIC 0x00090255 +LSEMAGIC 0x05091998 +GDTIOCTL_MAGIC 0x06030f07 +RIEBL_MAGIC 0x09051990 +RED_MAGIC2 0x170fc2a5 +BAYCOM_MAGIC 0x19730510 +ISDN_X25IFACE_MAGIC 0x1e75a2b9 +ECP_MAGIC 0x21504345 +NBD_REQUEST_MAGIC 0x25609513 +LSOMAGIC 0x27091997 +LSMAGIC 0x2a3b4d2a +WANPIPE_MAGIC 0x414C4453 +CS_CARD_MAGIC 0x43525553 +LABELCL_MAGIC 0x4857434c +ISDN_ASYNC_MAGIC 0x49344C01 +CTC_ASYNC_MAGIC 0x49344C01 +ISDN_NET_MAGIC 0x49344C02 +SAVEKMSG_MAGIC2 0x4B4D5347 +CS_STATE_MAGIC 0x4c4f4749 +SLAB_C_MAGIC 0x4f17a36d +COW_MAGIC 0x4f4f4f4d +I810_CARD_MAGIC 0x5072696E +TRIDENT_CARD_MAGIC 0x5072696E +ROUTER_MAGIC 0x524d4157 +SAVEKMSG_MAGIC1 0x53415645 +GDA_MAGIC 0x58464552 +RED_MAGIC1 0x5a2cf071 +EEPROM_MAGIC_VALUE 0x5ab478d2 ++=======
+ NBD_REQUEST_MAGIC 0x12560953 + BAYCOM_MAGIC 0x19730510 ++>>>>>>> HDLCDRV_MAGIC 0x5ac6e778 - PCXX_MAGIC 0x5c6df104 KV_MAGIC 0x5f4b565f ++<<<<<<< +I810_STATE_MAGIC 0x63657373 +TRIDENT_STATE_MAGIC 0x63657373 +M3_CARD_MAGIC 0x646e6f50 +FW_HEADER_MAGIC 0x65726F66 +SLOT_MAGIC 0x67267321 +SLOT_MAGIC 0x67267322 +NBD_REPLY_MAGIC 0x67446698 +LO_MAGIC 0x68797548 +M3_STATE_MAGIC 0x734d724d +VMALLOC_MAGIC 0x87654320 +KMALLOC_MAGIC 0x87654321 +PWC_MAGIC 0x89DC10AB +ENI155_MAGIC 0xa54b872d ++=======
++>>>>>>> CODA_MAGIC 0xC0DAC0DA - DPMEM_MAGIC 0xc0ffee11 YAM_MAGIC 0xF10A7654 CCB_MAGIC 0xf2691ad2 QUEUE_MAGIC_FREE 0xf7e1c9a3 diff --cc drivers/gpu/drm/Kconfig
index 198ba846d34bf,2438e0dccfa16. --- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@@ -51,9 -50,22 +51,28 @@@
If in doubt, say "N".
++<<<<<<< +config DRM_KUNIT_TEST
+ tristate "KUnit tests + depends on DRM && ++=======
+ config DRM_USE_DYNAMIC_DEBUG
+ bool "use dynamic + default y
+ depends on DRM
+ depends on DYNAMIC_DEBUG + depends on JUMP_LABEL
+ help
+ Use dynamic-debug to + Due to callsite counts + bytes per callsite, + are therefore configurable.
+
+ config DRM_DEBUG_SELFTEST
+ tristate "kselftests + depends on DRM
+ depends on DEBUG_KERNEL
++>>>>>>> select PRIME_NUMBERS
select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_HELPER
of the driver-core tree got a conflict in:
/> update: Correct magic values from nbd protocol, V2")
commits:
NBD_REPLY_MAGIC isn't a magic number")
remove define-only NBD_MAGIC, previously magic number")
(and probably more for context).
and can carry the fix as necessary. This
is concerned, but any non trivial
to your upstream maintainer when your tree
You may also want to consider cooperating
conflicting tree to minimise any particularly
gic-number.rst
.0000000000000
/> /> 0x5401
mgsl_info ``drivers/char/synclink.c``
tty_driver ``include/linux/tty_driver.h``
mgslpc_info ``drivers/char/pcmcia/synclink_cs.c``
usb_serial ``drivers/usb/serial/usb-serial.h``
``drivers/net/ethernet/dec/tulip/de2104x.c``
usb_bluetooth ``drivers/usb/class/bluetty.c``
``net/bluetooth/rfcomm/tty.c``
usb_serial_port ``drivers/usb/serial/usb-serial.h``
ufs_cylinder_group ``include/linux/ufs_fs.h``
lse ``drivers/fc4/fc.c``
``drivers/net/atarilance.c``
(any) ``mm/slab.c``
baycom_state ``drivers/net/baycom_epp.c``
isdn_x25iface_proto_data ``drivers/isdn/isdn_x25iface.h``
cdkecpsig ``include/linux/cdk.h``
nbd_request ``include/linux/nbd.h``
nbd_request ``include/uapi/linux/nbd.h``
lso ``drivers/fc4/fc.c``
ls ``drivers/fc4/fc.c``
sdla_{dump,exec} ``include/linux/wanpipe.h``
cs_card ``sound/oss/cs46xx.c``
labelcl_info_s ``include/asm/ia64/sn/labelcl.h``
modem_info ``include/linux/isdn.h``
ctc_tty_info ``drivers/s390/net/ctctty.c``
isdn_net_local_s ``drivers/isdn/i4l/isdn_net_lib.h``
savekmsg ``arch/*/amiga/config.c``
cs_state ``sound/oss/cs46xx.c``
kmem_cache ``mm/slab.c``
cow_header_v1 ``arch/um/drivers/ubd_user.c``
i810_card ``sound/oss/i810_audio.c``
trident_card ``sound/oss/trident.c``
wan_device [in ``wanrouter.h`` pre 3.9]
savekmsg ``arch/*/amiga/config.c``
gda ``arch/mips/include/asm/sn/gda.h``
(any) ``mm/slab.c``
lanai_dev ``drivers/atm/lanai.c``
baycom_state ``drivers/net/baycom_epp.c``
hdlcdrv_state ``include/linux/hdlcdrv.h``
channel ``drivers/char/pcxx.h``
kernel_vars_s ``arch/mips/include/asm/sn/klkernvars.h``
i810_state ``sound/oss/i810_audio.c``
trient_state ``sound/oss/trident.c``
m3_card ``sound/oss/maestro3.c``
fw_header ``drivers/atm/fore200e.h``
slot ``drivers/hotplug/cpqphp.h``
slot ``drivers/hotplug/acpiphp.h``
nbd_reply ``include/uapi/linux/nbd.h``
nbd_device ``include/linux/nbd.h``
m3_state ``sound/oss/maestro3.c``
snd_alloc_track ``sound/core/memory.c``
snd_alloc_track ``sound/core/memory.c``
pwc_device ``drivers/usb/media/pwc.h``
midway_eprom ``drivers/atm/eni.h``
coda_file_info ``fs/coda/coda_fs_i.h``
yam_port ``drivers/net/hamradio/yam.c``
ccb ``drivers/scsi/ncr53c8xx.c``
ns/it_IT/process/magic-number.rst
.0000000000000
t_IT/process/magic-number.rst
t_IT/process/magic-number.rst
0x5401
mgsl_info ``drivers/char/synclink.c``
tty_driver ``include/linux/tty_driver.h``
mgslpc_info ``drivers/char/pcmcia/synclink_cs.c``
HEAD
usb_serial ``drivers/usb/serial/usb-serial.h``
``drivers/net/ethernet/dec/tulip/de2104x.c``
usb_bluetooth ``drivers/usb/class/bluetty.c``
``net/bluetooth/rfcomm/tty.c``
usb_serial_port ``drivers/usb/serial/usb-serial.h``
ufs_cylinder_group ``include/linux/ufs_fs.h``
lse ``drivers/fc4/fc.c``
``drivers/net/atarilance.c``
(any) ``mm/slab.c``
baycom_state ``drivers/net/baycom_epp.c``
isdn_x25iface_proto_data ``drivers/isdn/isdn_x25iface.h``
cdkecpsig ``include/linux/cdk.h``
nbd_request ``include/uapi/linux/nbd.h``
lso ``drivers/fc4/fc.c``
ls ``drivers/fc4/fc.c``
sdla_{dump,exec} ``include/linux/wanpipe.h``
cs_card ``sound/oss/cs46xx.c``
labelcl_info_s ``include/asm/ia64/sn/labelcl.h``
modem_info ``include/linux/isdn.h``
ctc_tty_info ``drivers/s390/net/ctctty.c``
isdn_net_local_s ``drivers/isdn/i4l/isdn_net_lib.h``
savekmsg ``arch/*/amiga/config.c``
cs_state ``sound/oss/cs46xx.c``
kmem_cache ``mm/slab.c``
cow_header_v1 ``arch/um/drivers/ubd_user.c``
i810_card ``sound/oss/i810_audio.c``
trident_card ``sound/oss/trident.c``
wan_device [in ``wanrouter.h`` pre 3.9]
savekmsg ``arch/*/amiga/config.c``
gda ``arch/mips/include/asm/sn/gda.h``
(any) ``mm/slab.c``
lanai_dev ``drivers/atm/lanai.c``
nbd_request ``include/linux/nbd.h``
baycom_state ``drivers/net/baycom_epp.c``
driver-core/driver-core-next
hdlcdrv_state ``include/linux/hdlcdrv.h``
channel ``drivers/char/pcxx.h``
kernel_vars_s ``arch/mips/include/asm/sn/klkernvars.h``
HEAD
i810_state ``sound/oss/i810_audio.c``
trient_state ``sound/oss/trident.c``
m3_card ``sound/oss/maestro3.c``
fw_header ``drivers/atm/fore200e.h``
slot ``drivers/hotplug/cpqphp.h``
slot ``drivers/hotplug/acpiphp.h``
nbd_reply ``include/uapi/linux/nbd.h``
nbd_device ``include/linux/nbd.h``
m3_state ``sound/oss/maestro3.c``
snd_alloc_track ``sound/core/memory.c``
snd_alloc_track ``sound/core/memory.c``
pwc_device ``drivers/usb/media/pwc.h``
midway_eprom ``drivers/atm/eni.h``
driver-core/driver-core-next
coda_file_info ``fs/coda/coda_fs_i.h``
yam_port ``drivers/net/hamradio/yam.c``
ccb ``drivers/scsi/ncr53c8xx.c``
ns/zh_CN/process/magic-number.rst
.0000000000000
h_CN/process/magic-number.rst
h_CN/process/magic-number.rst
0x5401
mgsl_info ``drivers/char/synclink.c``
tty_driver ``include/linux/tty_driver.h``
mgslpc_info ``drivers/char/pcmcia/synclink_cs.c``
HEAD
usb_serial ``drivers/usb/serial/usb-serial.h``
``drivers/net/ethernet/dec/tulip/de2104x.c``
usb_bluetooth ``drivers/usb/class/bluetty.c``
``net/bluetooth/rfcomm/tty.c``
usb_serial_port ``drivers/usb/serial/usb-serial.h``
ufs_cylinder_group ``include/linux/ufs_fs.h``
lse ``drivers/fc4/fc.c``
gdth_iowr_str ``drivers/scsi/gdth_ioctl.h``
``drivers/net/atarilance.c``
(any) ``mm/slab.c``
baycom_state ``drivers/net/baycom_epp.c``
isdn_x25iface_proto_data ``drivers/isdn/isdn_x25iface.h``
cdkecpsig ``include/linux/cdk.h``
nbd_request ``include/uapi/linux/nbd.h``
lso ``drivers/fc4/fc.c``
ls ``drivers/fc4/fc.c``
sdla_{dump,exec} ``include/linux/wanpipe.h``
cs_card ``sound/oss/cs46xx.c``
labelcl_info_s ``include/asm/ia64/sn/labelcl.h``
modem_info ``include/linux/isdn.h``
ctc_tty_info ``drivers/s390/net/ctctty.c``
isdn_net_local_s ``drivers/isdn/i4l/isdn_net_lib.h``
savekmsg ``arch/*/amiga/config.c``
cs_state ``sound/oss/cs46xx.c``
kmem_cache ``mm/slab.c``
cow_header_v1 ``arch/um/drivers/ubd_user.c``
i810_card ``sound/oss/i810_audio.c``
trident_card ``sound/oss/trident.c``
wan_device [in ``wanrouter.h`` pre 3.9]
savekmsg ``arch/*/amiga/config.c``
gda ``arch/mips/include/asm/sn/gda.h``
(any) ``mm/slab.c``
lanai_dev ``drivers/atm/lanai.c``
nbd_request ``include/linux/nbd.h``
baycom_state ``drivers/net/baycom_epp.c``
driver-core/driver-core-next
hdlcdrv_state ``include/linux/hdlcdrv.h``
channel ``drivers/char/pcxx.h``
kernel_vars_s ``arch/mips/include/asm/sn/klkernvars.h``
HEAD
i810_state ``sound/oss/i810_audio.c``
trient_state ``sound/oss/trident.c``
m3_card ``sound/oss/maestro3.c``
fw_header ``drivers/atm/fore200e.h``
slot ``drivers/hotplug/cpqphp.h``
slot ``drivers/hotplug/acpiphp.h``
nbd_reply ``include/uapi/linux/nbd.h``
nbd_device ``include/linux/nbd.h``
m3_state ``sound/oss/maestro3.c``
snd_alloc_track ``sound/core/memory.c``
snd_alloc_track ``sound/core/memory.c``
pwc_device ``drivers/usb/media/pwc.h``
midway_eprom ``drivers/atm/eni.h``
driver-core/driver-core-next
coda_file_info ``fs/coda/coda_fs_i.h``
gdt_pci_sram ``drivers/scsi/gdth.h``
yam_port ``drivers/net/hamradio/yam.c``
ccb ``drivers/scsi/ncr53c8xx.c``
queue_entry ``drivers/scsi/arm/queue.c``
ns/zh_TW/process/magic-number.rst
.0000000000000
h_TW/process/magic-number.rst
h_TW/process/magic-number.rst
0x5401
mgsl_info ``drivers/char/synclink.c``
tty_driver ``include/linux/tty_driver.h``
mgslpc_info ``drivers/char/pcmcia/synclink_cs.c``
HEAD
usb_serial ``drivers/usb/serial/usb-serial.h``
``drivers/net/ethernet/dec/tulip/de2104x.c``
usb_bluetooth ``drivers/usb/class/bluetty.c``
``net/bluetooth/rfcomm/tty.c``
usb_serial_port ``drivers/usb/serial/usb-serial.h``
ufs_cylinder_group ``include/linux/ufs_fs.h``
lse ``drivers/fc4/fc.c``
gdth_iowr_str ``drivers/scsi/gdth_ioctl.h``
``drivers/net/atarilance.c``
(any) ``mm/slab.c``
baycom_state ``drivers/net/baycom_epp.c``
isdn_x25iface_proto_data ``drivers/isdn/isdn_x25iface.h``
cdkecpsig ``include/linux/cdk.h``
nbd_request ``include/uapi/linux/nbd.h``
lso ``drivers/fc4/fc.c``
ls ``drivers/fc4/fc.c``
sdla_{dump,exec} ``include/linux/wanpipe.h``
cs_card ``sound/oss/cs46xx.c``
labelcl_info_s ``include/asm/ia64/sn/labelcl.h``
modem_info ``include/linux/isdn.h``
ctc_tty_info ``drivers/s390/net/ctctty.c``
isdn_net_local_s ``drivers/isdn/i4l/isdn_net_lib.h``
savekmsg ``arch/*/amiga/config.c``
cs_state ``sound/oss/cs46xx.c``
kmem_cache ``mm/slab.c``
cow_header_v1 ``arch/um/drivers/ubd_user.c``
i810_card ``sound/oss/i810_audio.c``
trident_card ``sound/oss/trident.c``
wan_device [in ``wanrouter.h`` pre 3.9]
savekmsg ``arch/*/amiga/config.c``
gda ``arch/mips/include/asm/sn/gda.h``
(any) ``mm/slab.c``
lanai_dev ``drivers/atm/lanai.c``
nbd_request ``include/linux/nbd.h``
baycom_state ``drivers/net/baycom_epp.c``
driver-core/driver-core-next
hdlcdrv_state ``include/linux/hdlcdrv.h``
channel ``drivers/char/pcxx.h``
kernel_vars_s ``arch/mips/include/asm/sn/klkernvars.h``
HEAD
i810_state ``sound/oss/i810_audio.c``
trient_state ``sound/oss/trident.c``
m3_card ``sound/oss/maestro3.c``
fw_header ``drivers/atm/fore200e.h``
slot ``drivers/hotplug/cpqphp.h``
slot ``drivers/hotplug/acpiphp.h``
nbd_reply ``include/uapi/linux/nbd.h``
nbd_device ``include/linux/nbd.h``
m3_state ``sound/oss/maestro3.c``
snd_alloc_track ``sound/core/memory.c``
snd_alloc_track ``sound/core/memory.c``
pwc_device ``drivers/usb/media/pwc.h``
midway_eprom ``drivers/atm/eni.h``
driver-core/driver-core-next
coda_file_info ``fs/coda/coda_fs_i.h``
gdt_pci_sram ``drivers/scsi/gdth.h``
yam_port ``drivers/net/hamradio/yam.c``
ccb ``drivers/scsi/ncr53c8xx.c``
queue_entry ``drivers/scsi/arm/queue.c``
.0000000000000
config DRM_DEBUG_M
/> HEAD
for DRM" if !KUNIT_ALL_TESTS
KUNIT
debug to implement drm.debug"
|| DYNAMIC_DEBUG_CORE
avoid drm_debug_enabled() runtime overheads.
in DRM drivers (~4k in amdgpu) and 56
the .data costs can be substantial, and
for DRM"
driver-core/driver-core-next

2022-09-26 23:15:07

by Ahelenia Ziemiańska

[permalink] [raw]

Subject: Re: linux-next: manual merge of the driver-core tree with the jc_docs tree

Hi!

On Mon, Sep 26, 2022 at 10:06:31PM +0100, [email protected] wrote:
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> Documentation/process/magic-number.rst
>
> between commit:
>
> 32ba63d4b2e1a ("Doc update: Correct magic values from nbd protocol, V2")
>
> from the jc_docs tree and commits:
>
> 82805818898dd ("Documentation: NBD_REPLY_MAGIC isn't a magic number")
> bd5926220ffe0 ("nbd: remove define-only NBD_MAGIC, previously magic number")
>
> from the driver-core tree (and probably more for context).

If I'm reading the merge right (very much not a given!),
it seems that the NBD_REPLY_MAGIC (and LO_MAGIC?) constant(s) survived:
they both need to go for reasons listed in
bd5926220ffe0: LO_MAGIC doesn't exist
82805818898dd: NBD_REPLY_MAGIC is part of the line protocol,
not a magic number

This also reveals that I missed NBD_REQUEST_MAGIC
(needs to go, same reason as NBD_REPLY_MAGIC)
in the first pass, but that's unrelated here.

> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

The process here is unclear to me; I assume the "linux-next" here is
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/
but the latest update to the default branch appears to be from
4 days ago (and pending-fixes at 7h old has this file last modified in
2021), so I can't really validate if this merge is as I read it
(or, indeed, if it does include... the conflict markers?
because it does appear to introduce them
(or, at least, if I leave in the conflict markers and commit a merge,
it sure looks like what's represented below)?),
so idk.

Diff below trimmed down to the interesting bits with two lines of
context.

Best,
наб

> diff --cc Documentation/process/magic-number.rst
> index 133ecfa106070,f420fa2d7f8b8..0000000000000
> --- a/Documentation/process/magic-number.rst
> +++ b/Documentation/process/magic-number.rst
> @@@ -88,54 -77,10 +77,11 @@@ TTY_MAGIC 0x5401
> - SLOT_MAGIC 0x67267321 slot ``drivers/hotplug/cpqphp.h``
> - SLOT_MAGIC 0x67267322 slot ``drivers/hotplug/acpiphp.h``
> +NBD_REPLY_MAGIC 0x67446698 nbd_reply ``include/uapi/linux/nbd.h``
> - LO_MAGIC 0x68797548 nbd_device ``include/linux/nbd.h``
> - M3_STATE_MAGIC 0x734d724d m3_state ``sound/oss/maestro3.c``
> - VMALLOC_MAGIC 0x87654320 snd_alloc_track ``sound/core/memory.c``
> diff --cc Documentation/translations/it_IT/process/magic-number.rst
> index 17401994f2e84,fa7f926649d2f..0000000000000
> --- a/Documentation/translations/it_IT/process/magic-number.rst
> +++ b/Documentation/translations/it_IT/process/magic-number.rst
> @@@ -94,54 -83,10 +83,61 @@@ TTY_MAGIC 0x5401
> TTY_DRIVER_MAGIC 0x5402 tty_driver ``include/linux/tty_driver.h``
> MGSLPC_MAGIC 0x5402 mgslpc_info ``drivers/char/pcmcia/synclink_cs.c``
> ++<<<<<<< HEAD
> +USB_SERIAL_MAGIC 0x6702 usb_serial ``drivers/usb/serial/usb-serial.h``
> +FULL_DUPLEX_MAGIC 0x6969 ``drivers/net/ethernet/dec/tulip/de2104x.c``
> +RED_MAGIC1 0x5a2cf071 (any) ``mm/slab.c``
> +EEPROM_MAGIC_VALUE 0x5ab478d2 lanai_dev ``drivers/atm/lanai.c``
> ++=======
> + NBD_REQUEST_MAGIC 0x12560953 nbd_request ``include/linux/nbd.h``
> + BAYCOM_MAGIC 0x19730510 baycom_state ``drivers/net/baycom_epp.c``
> ++>>>>>>> driver-core/driver-core-next
> HDLCDRV_MAGIC 0x5ac6e778 hdlcdrv_state ``include/linux/hdlcdrv.h``
> - PCXX_MAGIC 0x5c6df104 channel ``drivers/char/pcxx.h``
> KV_MAGIC 0x5f4b565f kernel_vars_s ``arch/mips/include/asm/sn/klkernvars.h``
> ++<<<<<<< HEAD
> +I810_STATE_MAGIC 0x63657373 i810_state ``sound/oss/i810_audio.c``
> +TRIDENT_STATE_MAGIC 0x63657373 trient_state ``sound/oss/trident.c``
> +SLOT_MAGIC 0x67267321 slot ``drivers/hotplug/cpqphp.h``
> +SLOT_MAGIC 0x67267322 slot ``drivers/hotplug/acpiphp.h``
> +NBD_REPLY_MAGIC 0x67446698 nbd_reply ``include/uapi/linux/nbd.h``
> +LO_MAGIC 0x68797548 nbd_device ``include/linux/nbd.h``
> +M3_STATE_MAGIC 0x734d724d m3_state ``sound/oss/maestro3.c``
> +VMALLOC_MAGIC 0x87654320 snd_alloc_track ``sound/core/memory.c``
> +PWC_MAGIC 0x89DC10AB pwc_device ``drivers/usb/media/pwc.h``
> +ENI155_MAGIC 0xa54b872d midway_eprom ``drivers/atm/eni.h``
> ++=======
> ++>>>>>>> driver-core/driver-core-next
> CODA_MAGIC 0xC0DAC0DA coda_file_info ``fs/coda/coda_fs_i.h``
> YAM_MAGIC 0xF10A7654 yam_port ``drivers/net/hamradio/yam.c``
> diff --cc Documentation/translations/zh_CN/process/magic-number.rst
> index 1b376fe087b54,4371f16836936..0000000000000
> --- a/Documentation/translations/zh_CN/process/magic-number.rst
> +++ b/Documentation/translations/zh_CN/process/magic-number.rst
> @@@ -77,57 -66,11 +66,63 @@@ TTY_MAGIC 0x5401
> TTY_DRIVER_MAGIC 0x5402 tty_driver ``include/linux/tty_driver.h``
> MGSLPC_MAGIC 0x5402 mgslpc_info ``drivers/char/pcmcia/synclink_cs.c``
> ++<<<<<<< HEAD
> +USB_SERIAL_MAGIC 0x6702 usb_serial ``drivers/usb/serial/usb-serial.h``
> +FULL_DUPLEX_MAGIC 0x6969 ``drivers/net/ethernet/dec/tulip/de2104x.c``
> +RED_MAGIC1 0x5a2cf071 (any) ``mm/slab.c``
> +EEPROM_MAGIC_VALUE 0x5ab478d2 lanai_dev ``drivers/atm/lanai.c``
> ++=======
> + NBD_REQUEST_MAGIC 0x12560953 nbd_request ``include/linux/nbd.h``
> + BAYCOM_MAGIC 0x19730510 baycom_state ``drivers/net/baycom_epp.c``
> ++>>>>>>> driver-core/driver-core-next
> HDLCDRV_MAGIC 0x5ac6e778 hdlcdrv_state ``include/linux/hdlcdrv.h``
> - PCXX_MAGIC 0x5c6df104 channel ``drivers/char/pcxx.h``
> KV_MAGIC 0x5f4b565f kernel_vars_s ``arch/mips/include/asm/sn/klkernvars.h``
> ++<<<<<<< HEAD
> +I810_STATE_MAGIC 0x63657373 i810_state ``sound/oss/i810_audio.c``
> +TRIDENT_STATE_MAGIC 0x63657373 trient_state ``sound/oss/trident.c``
> +SLOT_MAGIC 0x67267321 slot ``drivers/hotplug/cpqphp.h``
> +SLOT_MAGIC 0x67267322 slot ``drivers/hotplug/acpiphp.h``
> +NBD_REPLY_MAGIC 0x67446698 nbd_reply ``include/uapi/linux/nbd.h``
> +LO_MAGIC 0x68797548 nbd_device ``include/linux/nbd.h``
> +M3_STATE_MAGIC 0x734d724d m3_state ``sound/oss/maestro3.c``
> +VMALLOC_MAGIC 0x87654320 snd_alloc_track ``sound/core/memory.c``
> +PWC_MAGIC 0x89DC10AB pwc_device ``drivers/usb/media/pwc.h``
> +ENI155_MAGIC 0xa54b872d midway_eprom ``drivers/atm/eni.h``
> ++=======
> ++>>>>>>> driver-core/driver-core-next
> CODA_MAGIC 0xC0DAC0DA coda_file_info ``fs/coda/coda_fs_i.h``
> - DPMEM_MAGIC 0xc0ffee11 gdt_pci_sram ``drivers/scsi/gdth.h``
> diff --cc Documentation/translations/zh_TW/process/magic-number.rst
> index ff385a369c7b4,3e83f18b9c18e..0000000000000
> --- a/Documentation/translations/zh_TW/process/magic-number.rst
> +++ b/Documentation/translations/zh_TW/process/magic-number.rst
> @@@ -80,57 -69,11 +69,63 @@@ TTY_MAGIC 0x5401
> TTY_DRIVER_MAGIC 0x5402 tty_driver ``include/linux/tty_driver.h``
> MGSLPC_MAGIC 0x5402 mgslpc_info ``drivers/char/pcmcia/synclink_cs.c``
> ++<<<<<<< HEAD
> +USB_SERIAL_MAGIC 0x6702 usb_serial ``drivers/usb/serial/usb-serial.h``
> +FULL_DUPLEX_MAGIC 0x6969 ``drivers/net/ethernet/dec/tulip/de2104x.c``
> +RED_MAGIC1 0x5a2cf071 (any) ``mm/slab.c``
> +EEPROM_MAGIC_VALUE 0x5ab478d2 lanai_dev ``drivers/atm/lanai.c``
> ++=======
> + NBD_REQUEST_MAGIC 0x12560953 nbd_request ``include/linux/nbd.h``
> + BAYCOM_MAGIC 0x19730510 baycom_state ``drivers/net/baycom_epp.c``
> ++>>>>>>> driver-core/driver-core-next
> HDLCDRV_MAGIC 0x5ac6e778 hdlcdrv_state ``include/linux/hdlcdrv.h``
> - PCXX_MAGIC 0x5c6df104 channel ``drivers/char/pcxx.h``
> KV_MAGIC 0x5f4b565f kernel_vars_s ``arch/mips/include/asm/sn/klkernvars.h``
> ++<<<<<<< HEAD
> +I810_STATE_MAGIC 0x63657373 i810_state ``sound/oss/i810_audio.c``
> +TRIDENT_STATE_MAGIC 0x63657373 trient_state ``sound/oss/trident.c``
> +SLOT_MAGIC 0x67267321 slot ``drivers/hotplug/cpqphp.h``
> +SLOT_MAGIC 0x67267322 slot ``drivers/hotplug/acpiphp.h``
> +NBD_REPLY_MAGIC 0x67446698 nbd_reply ``include/uapi/linux/nbd.h``
> +LO_MAGIC 0x68797548 nbd_device ``include/linux/nbd.h``
> +M3_STATE_MAGIC 0x734d724d m3_state ``sound/oss/maestro3.c``
> +VMALLOC_MAGIC 0x87654320 snd_alloc_track ``sound/core/memory.c``
> +PWC_MAGIC 0x89DC10AB pwc_device ``drivers/usb/media/pwc.h``
> +ENI155_MAGIC 0xa54b872d midway_eprom ``drivers/atm/eni.h``
> ++=======
> ++>>>>>>> driver-core/driver-core-next
> CODA_MAGIC 0xC0DAC0DA coda_file_info ``fs/coda/coda_fs_i.h``
> - DPMEM_MAGIC 0xc0ffee11 gdt_pci_sram ``drivers/scsi/gdth.h``

Attachments:

(No filename) (10.81 kB)
signature.asc (849.00 B)
Download all attachments

2022-09-26 23:36:36

by Jonathan Corbet

[permalink] [raw]

Subject: Re: linux-next: manual merge of the driver-core tree with the jc_docs tree

наб <[email protected]> writes:

> Hi!
>
> On Mon, Sep 26, 2022 at 10:06:31PM +0100, [email protected] wrote:
>> Today's linux-next merge of the driver-core tree got a conflict in:
>>
>> Documentation/process/magic-number.rst
>>
>> between commit:
>>
>> 32ba63d4b2e1a ("Doc update: Correct magic values from nbd protocol, V2")
>>
>> from the jc_docs tree and commits:
>>
>> 82805818898dd ("Documentation: NBD_REPLY_MAGIC isn't a magic number")
>> bd5926220ffe0 ("nbd: remove define-only NBD_MAGIC, previously magic number")
>>
>> from the driver-core tree (and probably more for context).
>
> If I'm reading the merge right (very much not a given!),
> it seems that the NBD_REPLY_MAGIC (and LO_MAGIC?) constant(s) survived:
> they both need to go for reasons listed in
> bd5926220ffe0: LO_MAGIC doesn't exist
> 82805818898dd: NBD_REPLY_MAGIC is part of the line protocol,
> not a magic number
>
> This also reveals that I missed NBD_REQUEST_MAGIC
> (needs to go, same reason as NBD_REPLY_MAGIC)
> in the first pass, but that's unrelated here.

I've been trying to make sense of that merge myself. Is the right
solution that I should just drop 32ba63d4b2e1a ? Manfred, thoughts on
that?

Thanks,

jon

2022-09-26 23:56:40

by Mark Brown

[permalink] [raw]

Subject: Re: linux-next: manual merge of the driver-core tree with the jc_docs tree

On Tue, Sep 27, 2022 at 12:46:21AM +0200, наб wrote:

> If I'm reading the merge right (very much not a given!),
> it seems that the NBD_REPLY_MAGIC (and LO_MAGIC?) constant(s) survived:
> they both need to go for reasons listed in
> bd5926220ffe0: LO_MAGIC doesn't exist
> 82805818898dd: NBD_REPLY_MAGIC is part of the line protocol,
> not a magic number

> This also reveals that I missed NBD_REQUEST_MAGIC
> (needs to go, same reason as NBD_REPLY_MAGIC)
> in the first pass, but that's unrelated here.

I preserved NBD_REPLY_MAGIC since the conflict was due to it being
updated by the NBD maintainer, I went with their logic instead. IIRC
they'd also moved it within the file which might make the resolution
harder to read. LO_MAGIC is gone.

It's not at all clear from what's in the file that your logic about not
including magic numbers defined elsewhere means we shouldn't include
them in the table here, though the commit messages are rather brief so
perhaps there is more to it. It's certainly a very strong definition of
need as far as I can tell.

> The process here is unclear to me; I assume the "linux-next" here is
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/
> but the latest update to the default branch appears to be from
> 4 days ago (and pending-fixes at 7h old has this file last modified in
> 2021), so I can't really validate if this merge is as I read it

I'm still in the process of building today's tree, all being well it
will be updated soonish (or I'll give up and hopefully things will go
more smoothly tomorrow).

> (or, indeed, if it does include... the conflict markers?
> because it does appear to introduce them
> (or, at least, if I leave in the conflict markers and commit a merge,
> it sure looks like what's represented below)?),
> so idk.

I skipped out on resolving the conflicts in the translated copies of the
file but messed up on resetting the to the base state.

Attachments:

(No filename) (1.96 kB)
signature.asc (499.00 B)
Download all attachments

2022-09-27 00:41:39

by Mark Brown

[permalink] [raw]

Subject: Re: linux-next: manual merge of the driver-core tree with the jc_docs tree

On Mon, Sep 26, 2022 at 04:54:45PM -0600, Jonathan Corbet wrote:
> наб <[email protected]> writes:

> > This also reveals that I missed NBD_REQUEST_MAGIC
> > (needs to go, same reason as NBD_REPLY_MAGIC)
> > in the first pass, but that's unrelated here.

> I've been trying to make sense of that merge myself. Is the right
> solution that I should just drop 32ba63d4b2e1a ? Manfred, thoughts on
> that?

That'd certainly be a viable option too.

Attachments:

(No filename) (478.00 B)
signature.asc (499.00 B)
Download all attachments

2022-09-27 01:02:54

by Ahelenia Ziemiańska

[permalink] [raw]

Subject: Re: linux-next: manual merge of the driver-core tree with the jc_docs tree

On Tue, Sep 27, 2022 at 12:44:10AM +0100, Mark Brown wrote:
> On Tue, Sep 27, 2022 at 12:46:21AM +0200, наб wrote:
>
> > If I'm reading the merge right (very much not a given!),
> > it seems that the NBD_REPLY_MAGIC (and LO_MAGIC?) constant(s) survived:
> > they both need to go for reasons listed in
> > bd5926220ffe0: LO_MAGIC doesn't exist
> > 82805818898dd: NBD_REPLY_MAGIC is part of the line protocol,
> > not a magic number
>
> > This also reveals that I missed NBD_REQUEST_MAGIC
> > (needs to go, same reason as NBD_REPLY_MAGIC)
> > in the first pass, but that's unrelated here.
>
> I preserved NBD_REPLY_MAGIC since the conflict was due to it being
> updated by the NBD maintainer, I went with their logic instead. IIRC
> they'd also moved it within the file which might make the resolution
> harder to read. LO_MAGIC is gone.
>
> It's not at all clear from what's in the file that your logic about not
> including magic numbers defined elsewhere means we shouldn't include
> them in the table here, though the commit messages are rather brief so
> perhaps there is more to it. It's certainly a very strong definition of
> need as far as I can tell.
>
> > (or, indeed, if it does include... the conflict markers?
> > because it does appear to introduce them
> > (or, at least, if I leave in the conflict markers and commit a merge,
> > it sure looks like what's represented below)?),
> > so idk.
>
> I skipped out on resolving the conflicts in the translated copies of the
> file but messed up on resetting the to the base state.

It seems I've overestimated the degree to which this matters
in this case, my b. Put me down as "don't care".

наб

Attachments:

(No filename) (1.69 kB)
signature.asc (849.00 B)
Download all attachments

2022-09-27 19:43:48

by Jonathan Corbet

[permalink] [raw]

Subject: Re: linux-next: manual merge of the driver-core tree with the jc_docs tree

Mark Brown <[email protected]> writes:

> On Mon, Sep 26, 2022 at 04:54:45PM -0600, Jonathan Corbet wrote:
>> наб <[email protected]> writes:
>
>> > This also reveals that I missed NBD_REQUEST_MAGIC
>> > (needs to go, same reason as NBD_REPLY_MAGIC)
>> > in the first pass, but that's unrelated here.
>
>> I've been trying to make sense of that merge myself. Is the right
>> solution that I should just drop 32ba63d4b2e1a ? Manfred, thoughts on
>> that?
>
> That'd certainly be a viable option too.

OK, I have dropped the conflicting patch. Manfred, if there are changes
there that still need to get in, please resubmit that part and we'll get
it done.

Thanks,

jon

2022-10-08 11:43:08

by Manfred Spraul

[permalink] [raw]

Subject: Re: linux-next: manual merge of the driver-core tree with the jc_docs tree

Hi,

On Dienstag, 27. September 2022 21:25 , Jonathan Corbet <[email protected]>
wrote:
> Mark Brown <[email protected]> writes:
>
>> On Mon, Sep 26, 2022 at 04:54:45PM -0600, Jonathan Corbet wrote:
>>> наб <[email protected]> writes:
>>>> This also reveals that I missed NBD_REQUEST_MAGIC (needs to go,
>>>> same reason as NBD_REPLY_MAGIC) in the first pass, but that's
>>>> unrelated here.
>>> I've been trying to make sense of that merge myself. Is the right
>>> solution that I should just drop 32ba63d4b2e1a ? Manfred, thoughts
>>> on that?
>> That'd certainly be a viable option too.
> OK, I have dropped the conflicting patch. Manfred, if there are changes there that still need to get in, please resubmit that part and we'll get it done.

Dropping is the correct approach:
The values are part of the line protocol, and thus according to the
current definition not in scope.

In theory, the change in include/uapi/linux/nbd.h is still useful, but I
do not think that this is worth the effort.
>
>
> diff --git a/include/uapi/linux/nbd.h b/include/uapi/linux/nbd.h
> index 20d6cc91435d..88752b20e6c8 100644
> --- a/include/uapi/linux/nbd.h
> +++ b/include/uapi/linux/nbd.h
> @@ -11,6 +11,8 @@
> *            Cleanup PARANOIA usage & code.
> * 2004/02/19 Paul Clements
> *            Removed PARANOIA, plus various cleanup and comments
> + *
> + * See doc/proto.md of the nbd package for more details on the protocol.
> */
>
> #ifndef _UAPILINUX_NBD_H
> @@ -63,7 +65,6 @@ enum {
>
> #define NBD_REQUEST_MAGIC 0x25609513
> #define NBD_REPLY_MAGIC 0x67446698
> -/* Do *not* use magics: 0x12560953 0x96744668. */
>
> /*
> * This is the packet used for communication between client and
> --
>

--

    Manfred