Hi Catalin,
On Sat, 2026-05-30 at 15:31 +0300, Catalin Iacob wrote:
> Commit 1cea5180f2f8 ("block: remove pktcdvd driver") left behind some
> CONFIG_CONFIG_CDROM_PKTCDVD* references in defconfigs and around an
> export. Remove them.
>
> Signed-off-by: Catalin Iacob <[email protected]>
> ---
> Found this incidentally while looking at kernel sources to understand
> what pktcdvd is
> ---
> arch/mips/configs/fuloong2e_defconfig | 1 -
> arch/mips/configs/ip22_defconfig | 1 -
> arch/mips/configs/ip27_defconfig | 1 -
> arch/mips/configs/ip30_defconfig | 1 -
> arch/mips/configs/jazz_defconfig | 1 -
> arch/mips/configs/malta_defconfig | 1 -
> arch/mips/configs/malta_kvm_defconfig | 1 -
> arch/mips/configs/maltaup_xpa_defconfig | 1 -
> arch/mips/configs/rm200_defconfig | 1 -
> arch/mips/configs/sb1250_swarm_defconfig | 1 -
> arch/powerpc/configs/g5_defconfig | 1 -
> arch/powerpc/configs/ppc6xx_defconfig | 1 -
> arch/sh/configs/sh2007_defconfig | 1 -
> arch/sparc/configs/sparc64_defconfig | 2 --
> drivers/scsi/scsi_lib.c | 8 --------
> 15 files changed, 23 deletions(-)
>
> diff --git a/arch/mips/configs/fuloong2e_defconfig
> b/arch/mips/configs/fuloong2e_defconfig
> index b6fe3c962464..840130a73992 100644
> --- a/arch/mips/configs/fuloong2e_defconfig
> +++ b/arch/mips/configs/fuloong2e_defconfig
> @@ -89,7 +89,6 @@ CONFIG_MTD_CFI_STAA=m
> CONFIG_MTD_PHYSMAP=m
> CONFIG_BLK_DEV_LOOP=y
> CONFIG_BLK_DEV_RAM=m
> -CONFIG_CDROM_PKTCDVD=m
> CONFIG_ATA_OVER_ETH=m
> CONFIG_BLK_DEV_SD=y
> CONFIG_BLK_DEV_SR=y
> diff --git a/arch/mips/configs/ip22_defconfig
> b/arch/mips/configs/ip22_defconfig
> index e123848f94ab..61f09cc9ac12 100644
> --- a/arch/mips/configs/ip22_defconfig
> +++ b/arch/mips/configs/ip22_defconfig
> @@ -177,7 +177,6 @@ CONFIG_NET_ACT_SIMP=m
> CONFIG_NET_ACT_SKBEDIT=m
> CONFIG_RFKILL=m
> CONFIG_CONNECTOR=m
> -CONFIG_CDROM_PKTCDVD=m
> CONFIG_ATA_OVER_ETH=m
> CONFIG_RAID_ATTRS=m
> CONFIG_SCSI=y
> diff --git a/arch/mips/configs/ip27_defconfig
> b/arch/mips/configs/ip27_defconfig
> index fea0ccee6948..60da9cf71b72 100644
> --- a/arch/mips/configs/ip27_defconfig
> +++ b/arch/mips/configs/ip27_defconfig
> @@ -83,7 +83,6 @@ CONFIG_CFG80211=m
> CONFIG_MAC80211=m
> CONFIG_RFKILL=m
> CONFIG_BLK_DEV_LOOP=y
> -CONFIG_CDROM_PKTCDVD=m
> CONFIG_ATA_OVER_ETH=m
> CONFIG_SCSI=y
> CONFIG_BLK_DEV_SD=y
> diff --git a/arch/mips/configs/ip30_defconfig
> b/arch/mips/configs/ip30_defconfig
> index 718f3060d9fa..5c2911ff9a87 100644
> --- a/arch/mips/configs/ip30_defconfig
> +++ b/arch/mips/configs/ip30_defconfig
> @@ -77,7 +77,6 @@ CONFIG_NET_ACT_PEDIT=m
> CONFIG_NET_ACT_SKBEDIT=m
> # CONFIG_VGA_ARB is not set
> CONFIG_BLK_DEV_LOOP=y
> -CONFIG_CDROM_PKTCDVD=m
> CONFIG_ATA_OVER_ETH=m
> CONFIG_SCSI=y
> CONFIG_BLK_DEV_SD=y
> diff --git a/arch/mips/configs/jazz_defconfig
> b/arch/mips/configs/jazz_defconfig
> index a790c2610fd3..dd3486b8d1fc 100644
> --- a/arch/mips/configs/jazz_defconfig
> +++ b/arch/mips/configs/jazz_defconfig
> @@ -33,7 +33,6 @@ CONFIG_BLK_DEV_FD=m
> CONFIG_BLK_DEV_LOOP=m
> CONFIG_BLK_DEV_NBD=m
> CONFIG_BLK_DEV_RAM=m
> -CONFIG_CDROM_PKTCDVD=m
> CONFIG_ATA_OVER_ETH=m
> CONFIG_RAID_ATTRS=m
> CONFIG_SCSI=y
> diff --git a/arch/mips/configs/malta_defconfig
> b/arch/mips/configs/malta_defconfig
> index 81704ec67f09..b10dac71f400 100644
> --- a/arch/mips/configs/malta_defconfig
> +++ b/arch/mips/configs/malta_defconfig
> @@ -224,7 +224,6 @@ CONFIG_BLK_DEV_FD=m
> CONFIG_BLK_DEV_LOOP=m
> CONFIG_BLK_DEV_NBD=m
> CONFIG_BLK_DEV_RAM=y
> -CONFIG_CDROM_PKTCDVD=m
> CONFIG_ATA_OVER_ETH=m
> CONFIG_RAID_ATTRS=m
> CONFIG_BLK_DEV_SD=y
> diff --git a/arch/mips/configs/malta_kvm_defconfig
> b/arch/mips/configs/malta_kvm_defconfig
> index 82a97f58bce1..bdd5d99884e3 100644
> --- a/arch/mips/configs/malta_kvm_defconfig
> +++ b/arch/mips/configs/malta_kvm_defconfig
> @@ -228,7 +228,6 @@ CONFIG_BLK_DEV_FD=m
> CONFIG_BLK_DEV_LOOP=m
> CONFIG_BLK_DEV_NBD=m
> CONFIG_BLK_DEV_RAM=y
> -CONFIG_CDROM_PKTCDVD=m
> CONFIG_ATA_OVER_ETH=m
> CONFIG_RAID_ATTRS=m
> CONFIG_BLK_DEV_SD=y
> diff --git a/arch/mips/configs/maltaup_xpa_defconfig
> b/arch/mips/configs/maltaup_xpa_defconfig
> index 0f9ef20744f9..523c0ff329ac 100644
> --- a/arch/mips/configs/maltaup_xpa_defconfig
> +++ b/arch/mips/configs/maltaup_xpa_defconfig
> @@ -226,7 +226,6 @@ CONFIG_BLK_DEV_FD=m
> CONFIG_BLK_DEV_LOOP=m
> CONFIG_BLK_DEV_NBD=m
> CONFIG_BLK_DEV_RAM=y
> -CONFIG_CDROM_PKTCDVD=m
> CONFIG_ATA_OVER_ETH=m
> CONFIG_RAID_ATTRS=m
> CONFIG_BLK_DEV_SD=y
> diff --git a/arch/mips/configs/rm200_defconfig
> b/arch/mips/configs/rm200_defconfig
> index ad9fbd0cbb38..60054e54bc5a 100644
> --- a/arch/mips/configs/rm200_defconfig
> +++ b/arch/mips/configs/rm200_defconfig
> @@ -177,7 +177,6 @@ CONFIG_PARIDE_ON26=m
> CONFIG_BLK_DEV_LOOP=m
> CONFIG_BLK_DEV_NBD=m
> CONFIG_BLK_DEV_RAM=m
> -CONFIG_CDROM_PKTCDVD=m
> CONFIG_ATA_OVER_ETH=m
> CONFIG_RAID_ATTRS=m
> CONFIG_SCSI=y
> diff --git a/arch/mips/configs/sb1250_swarm_defconfig
> b/arch/mips/configs/sb1250_swarm_defconfig
> index 4a25b8d3e507..a50a7c097542 100644
> --- a/arch/mips/configs/sb1250_swarm_defconfig
> +++ b/arch/mips/configs/sb1250_swarm_defconfig
> @@ -43,7 +43,6 @@ CONFIG_FW_LOADER=m
> CONFIG_CONNECTOR=m
> CONFIG_BLK_DEV_RAM=y
> CONFIG_BLK_DEV_RAM_SIZE=9220
> -CONFIG_CDROM_PKTCDVD=m
> CONFIG_ATA_OVER_ETH=m
> CONFIG_RAID_ATTRS=m
> CONFIG_BLK_DEV_SD=y
> diff --git a/arch/powerpc/configs/g5_defconfig
> b/arch/powerpc/configs/g5_defconfig
> index 5ca1676e6058..647775f6d174 100644
> --- a/arch/powerpc/configs/g5_defconfig
> +++ b/arch/powerpc/configs/g5_defconfig
> @@ -57,7 +57,6 @@ CONFIG_BLK_DEV_LOOP=y
> CONFIG_BLK_DEV_NBD=m
> CONFIG_BLK_DEV_RAM=y
> CONFIG_BLK_DEV_RAM_SIZE=65536
> -CONFIG_CDROM_PKTCDVD=m
> CONFIG_BLK_DEV_SD=y
> CONFIG_CHR_DEV_ST=y
> CONFIG_BLK_DEV_SR=y
> diff --git a/arch/powerpc/configs/ppc6xx_defconfig
> b/arch/powerpc/configs/ppc6xx_defconfig
> index eda1fec7ffd9..5c3e25fd8edd 100644
> --- a/arch/powerpc/configs/ppc6xx_defconfig
> +++ b/arch/powerpc/configs/ppc6xx_defconfig
> @@ -306,7 +306,6 @@ CONFIG_BLK_DEV_LOOP=m
> CONFIG_BLK_DEV_NBD=m
> CONFIG_BLK_DEV_RAM=y
> CONFIG_BLK_DEV_RAM_SIZE=16384
> -CONFIG_CDROM_PKTCDVD=m
> CONFIG_VIRTIO_BLK=m
> CONFIG_ENCLOSURE_SERVICES=m
> CONFIG_SENSORS_TSL2550=m
> diff --git a/arch/sh/configs/sh2007_defconfig
> b/arch/sh/configs/sh2007_defconfig
> index 5d9080499485..f287a41cd38c 100644
> --- a/arch/sh/configs/sh2007_defconfig
> +++ b/arch/sh/configs/sh2007_defconfig
> @@ -45,7 +45,6 @@ CONFIG_NETWORK_SECMARK=y
> CONFIG_NET_PKTGEN=y
> CONFIG_BLK_DEV_LOOP=y
> CONFIG_BLK_DEV_RAM=y
> -CONFIG_CDROM_PKTCDVD=y
> CONFIG_RAID_ATTRS=y
> CONFIG_SCSI=y
> CONFIG_BLK_DEV_SD=y
> diff --git a/arch/sparc/configs/sparc64_defconfig
> b/arch/sparc/configs/sparc64_defconfig
> index 632081a262ba..4abea39281cd 100644
> --- a/arch/sparc/configs/sparc64_defconfig
> +++ b/arch/sparc/configs/sparc64_defconfig
> @@ -60,8 +60,6 @@ CONFIG_CONNECTOR=m
> CONFIG_BLK_DEV_LOOP=m
> CONFIG_BLK_DEV_CRYPTOLOOP=m
> CONFIG_BLK_DEV_NBD=m
> -CONFIG_CDROM_PKTCDVD=m
> -CONFIG_CDROM_PKTCDVD_WCACHE=y
> CONFIG_ATA_OVER_ETH=m
> CONFIG_SUNVDC=m
> CONFIG_ATA=y
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index 6e8c7a42603e..f836212c2acf 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -2201,14 +2201,6 @@ struct scsi_device *scsi_device_from_queue(struct
> request_queue *q)
>
> return sdev;
> }
> -/*
> - * pktcdvd should have been integrated into the SCSI layers, but for
> historical
> - * reasons like the old IDE driver it isn't. This export allows it to safely
> - * probe if a given device is a SCSI one and only attach to that.
> - */
> -#ifdef CONFIG_CDROM_PKTCDVD_MODULE
> -EXPORT_SYMBOL_GPL(scsi_device_from_queue);
> -#endif
>
> /**
> * scsi_block_requests - Utility function used by low-level drivers to
> prevent
>
> ---
> base-commit: e7ae89a0c97ce2b68b0983cd01eda67cf373517d
> change-id: 20260530-remove-pktcdvd-references-9d5c6362a5de
>
> Best regards,
> --
> Catalin Iacob <[email protected]>
I think the commit message should rather be:
scsi: core: Remove remaining references to CONFIG_CDROM_PKTCDVD
or better
scsi: core: Remove remaining references to package CD/DVD support
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer
`. `' Physicist
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
