Commit cf52ad5f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-5.15-rc6' of... 

Merge tag 'driver-core-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core fixes from Greg KH:
 "Here are some small driver core fixes for 5.15-rc6, all of which have
  been in linux-next for a while with no reported issues.

  They include:

   - kernfs negative dentry bugfix

   - simple pm bus fixes to resolve reported issues"

* tag 'driver-core-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  drivers: bus: Delete CONFIG_SIMPLE_PM_BUS
  drivers: bus: simple-pm-bus: Add support for probing simple bus only devices
  driver core: Reject pointless SYNC_STATE_ONLY device links
  kernfs: don't create a negative dentry if inactive node exists
parents e3572dff 81967efb

arch/arm/configs/multi_v7_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ CONFIG_PCI_EPF_TEST=m 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_OMAP_OCP2SCP=y

CONFIG_SIMPLE_PM_BUS=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

arch/arm/configs/oxnas_v6_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ CONFIG_DEVTMPFS=y 
CONFIG_DEVTMPFS_MOUNT=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=64

CONFIG_SIMPLE_PM_BUS=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

arch/arm/configs/shmobile_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ CONFIG_PCI_RCAR_GEN2=y 
CONFIG_PCIE_RCAR_HOST=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_SIMPLE_PM_BUS=y

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

arch/arm/mach-omap2/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ config ARCH_OMAP2PLUS 
	select PM_GENERIC_DOMAINS

	select PM_GENERIC_DOMAINS_OF

	select RESET_CONTROLLER

	select SIMPLE_PM_BUS

	select SOC_BUS

	select TI_SYSC

	select OMAP_IRQCHIP

arch/arm64/configs/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -245,7 +245,6 @@ CONFIG_DEVTMPFS_MOUNT=y 
CONFIG_FW_LOADER_USER_HELPER=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

CONFIG_HISILICON_LPC=y

CONFIG_SIMPLE_PM_BUS=y

CONFIG_FSL_MC_BUS=y

CONFIG_TEGRA_ACONNECT=m

CONFIG_GNSS=m