Re: linux-next: manual merge of the tty tree with the drivers-misc tree

From: наб
Date: Mon Sep 26 2022 - 19:40:03 EST

Next
Previous
In
Next
Messages

On Mon, Sep 26, > Today's >
> Documentatio >
> between commits:
>
> 766c5a3ecb319 > 53c2bd6790172 >
> from >
> 7a4e0d2c7fb8e > 5052df99d3bc3 > 14f9ed6153705 > 0e6357c3b61d6 >
> from the tty tree.

Similar situation as

наб

> diff > index > --- a/Document > +++ b/Document > @@@ -69,19 > Magic Name > ===================== > PG_MAGIC > - HDLC_MAGIC > -CMAGIC > -MKISS_DRIVER_MAGIC > APM_BIOS_MAGIC > -DB_MAGIC > -DL_MAGIC > FASYNC_MAGIC > -FF_MAGIC > -PTY_MAGIC > -PPP_MAGIC > -SSTATE_MAGIC > SLIP_MAGIC > - TTY_MAGIC > - MGSL_MAGIC > - TTY_DRIVER_MAGIC > -STRIP_MAGIC > -SIXPACK_MAGIC > -AX25_MAGIC > MGSLPC_MAGIC > -USB_SERIAL_MAGIC > -FULL_DUPLEX_MAGIC > -USB_BLUETOOTH_MAGIC > -RFCOMM_TTY_MAGIC > -USB_SERIAL_PORT_MAGIC > -CG_MAGIC > -LSEMAGIC > -RIEBL_MAGIC > -NBD_REQUEST_MAGIC > -RED_MAGIC2 > +NBD_REQUEST_MAGIC > BAYCOM_MAGIC > -ISDN_X25IFACE_MAGIC > -ECP_MAGIC > -LSOMAGIC > -LSMAGIC > -WANPIPE_MAGIC > -CS_CARD_MAGIC > -LABELCL_MAGIC > -ISDN_ASYNC_MAGIC > -CTC_ASYNC_MAGIC > -ISDN_NET_MAGIC > -SAVEKMSG_MAGIC2 > -CS_STATE_MAGIC > -SLAB_C_MAGIC > -COW_MAGIC > -I810_CARD_MAGIC > -TRIDENT_CARD_MAGIC > -ROUTER_MAGIC > -SAVEKMSG_MAGIC1 > -GDA_MAGIC > -RED_MAGIC1 > -EEPROM_MAGIC_VALUE > HDLCDRV_MAGIC > -PCXX_MAGIC > KV_MAGIC > -I810_STATE_MAGIC > -TRIDENT_STATE_MAGIC > -M3_CARD_MAGIC > -FW_HEADER_MAGIC > -SLOT_MAGIC > -SLOT_MAGIC > -LO_MAGIC > -M3_STATE_MAGIC > -VMALLOC_MAGIC > -KMALLOC_MAGIC > -PWC_MAGIC > -NBD_REPLY_MAGIC > -ENI155_MAGIC > +NBD_REPLY_MAGIC > CODA_MAGIC > YAM_MAGIC > CCB_MAGIC > diff > index > --- a/Document > +++ b/Document > @@@ -75,15 > Nome magico > ===================== > PG_MAGIC > ++<<< > +HDLC_MAGIC > ++=======
> + CMAGIC > + MKISS_DRIVER_MAGIC > ++>>> > APM_BIOS_MAGIC > -DB_MAGIC > -DL_MAGIC > FASYNC_MAGIC > -FF_MAGIC > -PTY_MAGIC > -PPP_MAGIC > -SSTATE_MAGIC > SLIP_MAGIC > ++<<< > +TTY_MAGIC > +MGSL_MAGIC > +TTY_DRIVER_MAGIC > ++=======
> + STRIP_MAGIC > + SIXPACK_MAGIC > + AX25_MAGIC > ++>>> > MGSLPC_MAGIC > +<<< > USB_SERIAL_MAGIC > FULL_DUPLEX_MAGIC > USB_BLUETOOTH_MAGIC > diff > index > --- a/Document > +++ b/Document > @@@ -58,15 > é > ===================== > PG_MAGIC > ++<<< > +HDLC_MAGIC > ++=======
> + CMAGIC > + MKISS_DRIVER_MAGIC > ++>>> > APM_BIOS_MAGIC > -DB_MAGIC > -DL_MAGIC > FASYNC_MAGIC > -FF_MAGIC > -PTY_MAGIC > -PPP_MAGIC > -SSTATE_MAGIC > SLIP_MAGIC > ++<<< > +TTY_MAGIC > +MGSL_MAGIC > +TTY_DRIVER_MAGIC > ++=======
> + STRIP_MAGIC > + SIXPACK_MAGIC > + AX25_MAGIC > ++>>> > MGSLPC_MAGIC > +<<< > USB_SERIAL_MAGIC > FULL_DUPLEX_MAGIC > USB_BLUETOOTH_MAGIC > diff > index > --- a/Document > +++ b/Document > @@@ -61,15 > é > ===================== > PG_MAGIC > ++<<< > +HDLC_MAGIC > ++=======
> + CMAGIC > + MKISS_DRIVER_MAGIC > ++>>> > APM_BIOS_MAGIC > -DB_MAGIC > -DL_MAGIC > FASYNC_MAGIC > -FF_MAGIC > -PTY_MAGIC > -PPP_MAGIC > -SSTATE_MAGIC > SLIP_MAGIC > ++<<< > +TTY_MAGIC > +MGSL_MAGIC > +TTY_DRIVER_MAGIC > ++=======
> + STRIP_MAGIC > + SIXPACK_MAGIC > + AX25_MAGIC > ++>>> > MGSLPC_MAGIC > +<<< > USB_SERIAL_MAGIC > FULL_DUPLEX_MAGIC > USB_BLUETOOTH_MAGIC
Attachment: Description: PGP signature message: Vishal Annapurve: "Re: [V2 PATCH 4/8] KVM: selftests: x86: Precompute the result for is_{intel,amd}_cpu()" message: Joel Fernandes: "Re: [PATCH v6 1/4] rcu: Make call_rcu() lazy to save power" reply to: broonie: "linux-next: manual merge of the tty tree with the drivers-misc tree" in thread: Mark Brown: "Re: linux-next: manual merge of the tty tree with the drivers-misc tree" sorted by: [ date ] [ thread ] [ subject ] [ author ] 2022 at 10:34:14PM +0100, broonie@xxxxxxxxxx wrote:
linux-next merge of the tty tree got a conflict in:
n/process/magic-number.rst
("Documentation: remove nonexistent magic numbers")
("a.out: remove define-only CMAGIC, previously magic number")
the drivers-misc tree and commits:
("tty: remove TTY_MAGIC")
("tty: remove TTY_DRIVER_MAGIC")
("tty: n_hdlc: remove HDLC_MAGIC")
("tty: synclink_gt: remove MGSL_MAGIC")
href="https://lore.kernel.org/all/20220926210631.657728-1-broonie@xxxxxxxxxx/t">https://lore.kernel.org/all/20220926210631.657728-1-broonie@xxxxxxxxxx/t
appears horribly broken only in the non-english files,
--cc Documentation/process/magic-number.rst
0387e8014074a,2326c3be94fc6..0000000000000
ation/process/magic-number.rst
ation/process/magic-number.rst
-69,69 +69,15 @@@ Changelog:
Number Structure File
================ ======================== ==========================================
'P' pg_{read,write}_hdr ``include/linux/pg.h``
0x239e n_hdlc ``drivers/char/n_hdlc.c``
0x0111 user ``include/linux/a.out.h``
0x04bf mkiss_channel ``drivers/net/mkiss.h``
0x4101 apm_user ``arch/x86/kernel/apm_32.c``
0x4442 fc_info ``drivers/net/iph5526_novram.c``
0x444d fc_info ``drivers/net/iph5526_novram.c``
0x4601 fasync_struct ``include/linux/fs.h``
0x4646 fc_info ``drivers/net/iph5526_novram.c``
0x5001 ``drivers/char/pty.c``
0x5002 ppp ``include/linux/if_pppvar.h``
0x5302 serial_state ``include/linux/serial.h``
0x5302 slip ``drivers/net/slip.h``
0x5401 tty_struct ``include/linux/tty.h``
0x5401 mgsl_info ``drivers/char/synclink.c``
0x5402 tty_driver ``include/linux/tty_driver.h``
0x5303 strip ``drivers/net/strip.c``
0x5304 sixpack ``drivers/net/hamradio/6pack.h``
0x5316 ax_disp ``drivers/net/mkiss.h``
0x5402 mgslpc_info ``drivers/char/pcmcia/synclink_cs.c``
0x6702 usb_serial ``drivers/usb/serial/usb-serial.h``
0x6969 ``drivers/net/ethernet/dec/tulip/de2104x.c``
0x6d02 usb_bluetooth ``drivers/usb/class/bluetty.c``
0x6d02 ``net/bluetooth/rfcomm/tty.c``
0x7301 usb_serial_port ``drivers/usb/serial/usb-serial.h``
0x00090255 ufs_cylinder_group ``include/linux/ufs_fs.h``
0x05091998 lse ``drivers/fc4/fc.c``
0x09051990 ``drivers/net/atarilance.c``
0x12560953 nbd_request ``include/linux/nbd.h``
0x170fc2a5 (any) ``mm/slab.c``
0x25609513 nbd_request ``include/uapi/linux/nbd.h``
0x19730510 baycom_state ``drivers/net/baycom_epp.c``
0x1e75a2b9 isdn_x25iface_proto_data ``drivers/isdn/isdn_x25iface.h``
0x21504345 cdkecpsig ``include/linux/cdk.h``
0x27091997 lso ``drivers/fc4/fc.c``
0x2a3b4d2a ls ``drivers/fc4/fc.c``
0x414C4453 sdla_{dump,exec} ``include/linux/wanpipe.h``
0x43525553 cs_card ``sound/oss/cs46xx.c``
0x4857434c labelcl_info_s ``include/asm/ia64/sn/labelcl.h``
0x49344C01 modem_info ``include/linux/isdn.h``
0x49344C01 ctc_tty_info ``drivers/s390/net/ctctty.c``
0x49344C02 isdn_net_local_s ``drivers/isdn/i4l/isdn_net_lib.h``
0x4B4D5347 savekmsg ``arch/*/amiga/config.c``
0x4c4f4749 cs_state ``sound/oss/cs46xx.c``
0x4f17a36d kmem_cache ``mm/slab.c``
0x4f4f4f4d cow_header_v1 ``arch/um/drivers/ubd_user.c``
0x5072696E i810_card ``sound/oss/i810_audio.c``
0x5072696E trident_card ``sound/oss/trident.c``
0x524d4157 wan_device [in ``wanrouter.h`` pre 3.9]
0x53415645 savekmsg ``arch/*/amiga/config.c``
0x58464552 gda ``arch/mips/include/asm/sn/gda.h``
0x5a2cf071 (any) ``mm/slab.c``
0x5ab478d2 lanai_dev ``drivers/atm/lanai.c``
0x5ac6e778 hdlcdrv_state ``include/linux/hdlcdrv.h``
0x5c6df104 channel ``drivers/char/pcxx.h``
0x5f4b565f kernel_vars_s ``arch/mips/include/asm/sn/klkernvars.h``
0x63657373 i810_state ``sound/oss/i810_audio.c``
0x63657373 trient_state ``sound/oss/trident.c``
0x646e6f50 m3_card ``sound/oss/maestro3.c``
0x65726F66 fw_header ``drivers/atm/fore200e.h``
0x67267321 slot ``drivers/hotplug/cpqphp.h``
0x67267322 slot ``drivers/hotplug/acpiphp.h``
0x68797548 nbd_device ``include/linux/nbd.h``
0x734d724d m3_state ``sound/oss/maestro3.c``
0x87654320 snd_alloc_track ``sound/core/memory.c``
0x87654321 snd_alloc_track ``sound/core/memory.c``
0x89DC10AB pwc_device ``drivers/usb/media/pwc.h``
0x96744668 nbd_reply ``include/linux/nbd.h``
0xa54b872d midway_eprom ``drivers/atm/eni.h``
0x67446698 nbd_reply ``include/uapi/linux/nbd.h``
0xC0DAC0DA coda_file_info ``fs/coda/coda_fs_i.h``
0xF10A7654 yam_port ``drivers/net/hamradio/yam.c``
0xf2691ad2 ccb ``drivers/scsi/ncr53c8xx.c``
--cc Documentation/translations/it_IT/process/magic-number.rst
cfb8d69768aae,1803497816f1e..0000000000000
ation/translations/it_IT/process/magic-number.rst
ation/translations/it_IT/process/magic-number.rst
-75,21 +75,26 @@@ Registro dei cambiamenti:
Numero Struttura File
================ ======================== ==========================================
'P' pg_{read,write}_hdr ``include/linux/pg.h``
<<<< HEAD
0x239e n_hdlc ``drivers/char/n_hdlc.c``
0x0111 user ``include/linux/a.out.h``
0x04bf mkiss_channel ``drivers/net/mkiss.h``
>>>> tty/tty-next
0x4101 apm_user ``arch/x86/kernel/apm_32.c``
0x4442 fc_info ``drivers/net/iph5526_novram.c``
0x444d fc_info ``drivers/net/iph5526_novram.c``
0x4601 fasync_struct ``include/linux/fs.h``
0x4646 fc_info ``drivers/net/iph5526_novram.c``
0x5001 ``drivers/char/pty.c``
0x5002 ppp ``include/linux/if_pppvar.h``
0x5302 serial_state ``include/linux/serial.h``
0x5302 slip ``drivers/net/slip.h``
<<<< HEAD
0x5401 tty_struct ``include/linux/tty.h``
0x5401 mgsl_info ``drivers/char/synclink.c``
0x5402 tty_driver ``include/linux/tty_driver.h``
0x5303 strip ``drivers/net/strip.c``
0x5304 sixpack ``drivers/net/hamradio/6pack.h``
0x5316 ax_disp ``drivers/net/mkiss.h``
>>>> tty/tty-next
0x5402 mgslpc_info ``drivers/char/pcmcia/synclink_cs.c``
<<<< HEAD
0x6702 usb_serial ``drivers/usb/serial/usb-serial.h``
0x6969 ``drivers/net/ethernet/dec/tulip/de2104x.c``
0x6d02 usb_bluetooth ``drivers/usb/class/bluetty.c``
--cc Documentation/translations/zh_CN/process/magic-number.rst
2df729592547f,9780bf710eebc..0000000000000
ation/translations/zh_CN/process/magic-number.rst
ation/translations/zh_CN/process/magic-number.rst
-58,21 +58,26 @@@ Linux é”æœ¯æ•
”æœ¯æ•°å æ•°å— ç»“æž„ æ–‡ä»¶
================ ======================== ==========================================
'P' pg_{read,write}_hdr ``include/linux/pg.h``
<<<< HEAD
0x239e n_hdlc ``drivers/char/n_hdlc.c``
0x0111 user ``include/linux/a.out.h``
0x04bf mkiss_channel ``drivers/net/mkiss.h``
>>>> tty/tty-next
0x4101 apm_user ``arch/x86/kernel/apm_32.c``
0x4442 fc_info ``drivers/net/iph5526_novram.c``
0x444d fc_info ``drivers/net/iph5526_novram.c``
0x4601 fasync_struct ``include/linux/fs.h``
0x4646 fc_info ``drivers/net/iph5526_novram.c``
0x5001 ``drivers/char/pty.c``
0x5002 ppp ``include/linux/if_pppvar.h``
0x5302 serial_state ``include/linux/serial.h``
0x5302 slip ``drivers/net/slip.h``
<<<< HEAD
0x5401 tty_struct ``include/linux/tty.h``
0x5401 mgsl_info ``drivers/char/synclink.c``
0x5402 tty_driver ``include/linux/tty_driver.h``
0x5303 strip ``drivers/net/strip.c``
0x5304 sixpack ``drivers/net/hamradio/6pack.h``
0x5316 ax_disp ``drivers/net/mkiss.h``
>>>> tty/tty-next
0x5402 mgslpc_info ``drivers/char/pcmcia/synclink_cs.c``
<<<< HEAD
0x6702 usb_serial ``drivers/usb/serial/usb-serial.h``
0x6969 ``drivers/net/ethernet/dec/tulip/de2104x.c``
0x6d02 usb_bluetooth ``drivers/usb/class/bluetty.c``
--cc Documentation/translations/zh_TW/process/magic-number.rst
4cbb93dadef78,933545e92137a..0000000000000
ation/translations/zh_TW/process/magic-number.rst
ation/translations/zh_TW/process/magic-number.rst
-61,21 +61,26 @@@ Linux é”è¡“æ•
”è¡“æ•¸å æ•¸å— çµæ§‹ æ–‡ä»¶
================ ======================== ==========================================
'P' pg_{read,write}_hdr ``include/linux/pg.h``
<<<< HEAD
0x239e n_hdlc ``drivers/char/n_hdlc.c``
0x0111 user ``include/linux/a.out.h``
0x04bf mkiss_channel ``drivers/net/mkiss.h``
>>>> tty/tty-next
0x4101 apm_user ``arch/x86/kernel/apm_32.c``
0x4442 fc_info ``drivers/net/iph5526_novram.c``
0x444d fc_info ``drivers/net/iph5526_novram.c``
0x4601 fasync_struct ``include/linux/fs.h``
0x4646 fc_info ``drivers/net/iph5526_novram.c``
0x5001 ``drivers/char/pty.c``
0x5002 ppp ``include/linux/if_pppvar.h``
0x5302 serial_state ``include/linux/serial.h``
0x5302 slip ``drivers/net/slip.h``
<<<< HEAD
0x5401 tty_struct ``include/linux/tty.h``
0x5401 mgsl_info ``drivers/char/synclink.c``
0x5402 tty_driver ``include/linux/tty_driver.h``
0x5303 strip ``drivers/net/strip.c``
0x5304 sixpack ``drivers/net/hamradio/6pack.h``
0x5316 ax_disp ``drivers/net/mkiss.h``
>>>> tty/tty-next
0x5402 mgslpc_info ``drivers/char/pcmcia/synclink_cs.c``
<<<< HEAD
0x6702 usb_serial ``drivers/usb/serial/usb-serial.h``
0x6969 ``drivers/net/ethernet/dec/tulip/de2104x.c``
0x6d02 usb_bluetooth ``drivers/usb/class/bluetty.c``
>signature.asc

Next message: Vishal Annapurve: "Re: [V2 PATCH 4/8] KVM: selftests: x86: Precompute the result for is_{intel,amd}_cpu()"
Previous message: Joel Fernandes: "Re: [PATCH v6 1/4] rcu: Make call_rcu() lazy to save power"
In reply to: broonie: "linux-next: manual merge of the tty tree with the drivers-misc tree"
Next in thread: Mark Brown: "Re: linux-next: manual merge of the tty tree with the drivers-misc tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]