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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi!

On Mon, Sep 26, 2022 at 10:06:31PM +0100, broonie@xxxxxxxxxx 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``

Attachment: signature.asc
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux