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

Merge tag 'for-linus-6.12a-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fix from Juergen Gross:
 "Fix Xen config issue introduced in the merge window"

* tag 'for-linus-6.12a-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: Fix config option reference in XEN_PRIVCMD definition
parents fdd0a94d 9af48210

drivers/xen/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ config XEN_SCSI_BACKEND 
config XEN_PRIVCMD

	tristate "Xen hypercall passthrough driver"

	depends on XEN

	imply CONFIG_XEN_PCIDEV_BACKEND

	imply XEN_PCIDEV_BACKEND

	default m

	help

	  The hypercall passthrough driver allows privileged user programs to