Unverified Commit f345d2b5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2614 CVE-2022-44033 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Xiaoxu <zhangxiaoxu5@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/M6WBCJW75GNY4OP7YTNPG2CDUC2YMTVY/ 
Jiri Slaby (2):
  tty: ipwireless: move Kconfig entry to tty
  char: pcmcia: remove all the drivers


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I5YGNO 
 
Link:https://gitee.com/openeuler/kernel/pulls/2614

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 81311949 7424e1f0

Documentation/ioctl/ioctl-number.txt

+0 −1
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ Code Seq#(hex) Include File Comments 
'a'	00-0F	drivers/crypto/qat/qat_common/adf_cfg_common.h	conflict! qat driver

'b'	00-FF				conflict! bit3 vme host bridge

					<mailto:natalia@nikhefk.nikhef.nl>

'c'	all	linux/cm4000_cs.h	conflict!

'c'	00-7F	linux/comstats.h	conflict!

'c'	00-7F	linux/coda.h		conflict!

'c'	00-1F	linux/chio.h		conflict!

Documentation/process/magic-number.rst

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ AX25_MAGIC 0x5316 ax_disp ``drivers/net/mk 
TTY_MAGIC             0x5401           tty_struct               ``include/linux/tty.h``

MGSL_MAGIC            0x5401           mgsl_info                ``drivers/char/synclink.c``

TTY_DRIVER_MAGIC      0x5402           tty_driver               ``include/linux/tty_driver.h``

MGSLPC_MAGIC          0x5402           mgslpc_info              ``drivers/char/pcmcia/synclink_cs.c``

TTY_LDISC_MAGIC       0x5403           tty_ldisc                ``include/linux/tty_ldisc.h``

USB_SERIAL_MAGIC      0x6702           usb_serial               ``drivers/usb/serial/usb-serial.h``

FULL_DUPLEX_MAGIC     0x6969                                    ``drivers/net/ethernet/dec/tulip/de2104x.c``

Documentation/translations/zh_CN/magic-number.txt

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ AX25_MAGIC 0x5316 ax_disp drivers/net/mkiss.h 
TTY_MAGIC             0x5401      tty_struct        include/linux/tty.h

MGSL_MAGIC            0x5401      mgsl_info         drivers/char/synclink.c

TTY_DRIVER_MAGIC      0x5402      tty_driver        include/linux/tty_driver.h

MGSLPC_MAGIC          0x5402      mgslpc_info       drivers/char/pcmcia/synclink_cs.c

TTY_LDISC_MAGIC       0x5403      tty_ldisc         include/linux/tty_ldisc.h

USB_SERIAL_MAGIC      0x6702      usb_serial        drivers/usb/serial/usb-serial.h

FULL_DUPLEX_MAGIC     0x6969                        drivers/net/ethernet/dec/tulip/de2104x.c

MAINTAINERS

+0 −17
Original line number Diff line number Diff line
@@ -10703,18 +10703,6 @@ S: Maintained 
F:	Documentation/filesystems/omfs.txt

F:	fs/omfs/



OMNIKEY CARDMAN 4000 DRIVER

M:	Harald Welte <laforge@gnumonks.org>

S:	Maintained

F:	drivers/char/pcmcia/cm4000_cs.c

F:	include/linux/cm4000_cs.h

F:	include/uapi/linux/cm4000_cs.h



OMNIKEY CARDMAN 4040 DRIVER

M:	Harald Welte <laforge@gnumonks.org>

S:	Maintained

F:	drivers/char/pcmcia/cm4040_cs.*



OMNIVISION OV13858 SENSOR DRIVER

M:	Sakari Ailus <sakari.ailus@linux.intel.com>

L:	linux-media@vger.kernel.org
@@ -12947,11 +12935,6 @@ F: include/linux/sched.h 
F:	include/uapi/linux/sched.h

F:	include/linux/wait.h



SCR24X CHIP CARD INTERFACE DRIVER

M:	Lubomir Rintel <lkundrak@v3.sk>

S:	Supported

F:	drivers/char/pcmcia/scr24x_cs.c



SCSI CDROM DRIVER

M:	Jens Axboe <axboe@kernel.dk>

L:	linux-scsi@vger.kernel.org

arch/powerpc/configs/ppc6xx_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -660,8 +660,6 @@ CONFIG_HW_RANDOM_VIRTIO=m 
CONFIG_NVRAM=y

CONFIG_DTLK=m

CONFIG_R3964=m

CONFIG_CARDMAN_4000=m

CONFIG_CARDMAN_4040=m

CONFIG_IPWIRELESS=m

CONFIG_I2C_CHARDEV=m

CONFIG_I2C_HYDRA=m