Skip to content

Commit e5dfecd

Browse files
bmastbergenbmastbergen
committed
[CIQ] v6.12.24 - rebased configs
CONFIG_IRQ_BYPASS_MANAGER now follows KVM CONFIG_HAVE_KVM_IRQ_BYPASS now follows KVM KVM: Allow building irqbypass.ko as as module when kvm.ko is a module Upstream: fae0a87 CONFIG_HID_UNIVERSAL_PIDFF is new HID: Add hid-universal-pidff driver and supported device ids Upstream: f45f26a
1 parent c0e0b8c commit e5dfecd

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

‎ciq/configs/kernel-aarch64-64k-debug.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.23 Kernel Configuration
3+
# Linux/arm64 6.12.24 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -6028,6 +6028,7 @@ CONFIG_HID_THRUSTMASTER=m
60286028
# CONFIG_THRUSTMASTER_FF is not set
60296029
# CONFIG_HID_UDRAW_PS3 is not set
60306030
# CONFIG_HID_U2FZERO is not set
6031+
# CONFIG_HID_UNIVERSAL_PIDFF is not set
60316032
CONFIG_HID_WACOM=m
60326033
CONFIG_HID_WIIMOTE=m
60336034
# CONFIG_HID_WINWING is not set

‎ciq/configs/kernel-aarch64-64k.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.23 Kernel Configuration
3+
# Linux/arm64 6.12.24 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -6008,6 +6008,7 @@ CONFIG_HID_THRUSTMASTER=m
60086008
# CONFIG_THRUSTMASTER_FF is not set
60096009
# CONFIG_HID_UDRAW_PS3 is not set
60106010
# CONFIG_HID_U2FZERO is not set
6011+
# CONFIG_HID_UNIVERSAL_PIDFF is not set
60116012
CONFIG_HID_WACOM=m
60126013
CONFIG_HID_WIIMOTE=m
60136014
# CONFIG_HID_WINWING is not set

‎ciq/configs/kernel-aarch64-debug.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.23 Kernel Configuration
3+
# Linux/arm64 6.12.24 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -6032,6 +6032,7 @@ CONFIG_HID_THRUSTMASTER=m
60326032
# CONFIG_THRUSTMASTER_FF is not set
60336033
# CONFIG_HID_UDRAW_PS3 is not set
60346034
# CONFIG_HID_U2FZERO is not set
6035+
# CONFIG_HID_UNIVERSAL_PIDFF is not set
60356036
CONFIG_HID_WACOM=m
60366037
CONFIG_HID_WIIMOTE=m
60376038
# CONFIG_HID_WINWING is not set

‎ciq/configs/kernel-aarch64.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.23 Kernel Configuration
3+
# Linux/arm64 6.12.24 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -6012,6 +6012,7 @@ CONFIG_HID_THRUSTMASTER=m
60126012
# CONFIG_THRUSTMASTER_FF is not set
60136013
# CONFIG_HID_UDRAW_PS3 is not set
60146014
# CONFIG_HID_U2FZERO is not set
6015+
# CONFIG_HID_UNIVERSAL_PIDFF is not set
60156016
CONFIG_HID_WACOM=m
60166017
CONFIG_HID_WIIMOTE=m
60176018
# CONFIG_HID_WINWING is not set

‎ciq/configs/kernel-x86_64-debug.config‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86_64 6.12.23 Kernel Configuration
3+
# Linux/x86_64 6.12.24 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -779,7 +779,7 @@ CONFIG_KVM_VFIO=y
779779
CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
780780
CONFIG_KVM_GENERIC_PRE_FAULT_MEMORY=y
781781
CONFIG_KVM_COMPAT=y
782-
CONFIG_HAVE_KVM_IRQ_BYPASS=y
782+
CONFIG_HAVE_KVM_IRQ_BYPASS=m
783783
CONFIG_HAVE_KVM_NO_POLL=y
784784
CONFIG_KVM_XFER_TO_GUEST_WORK=y
785785
CONFIG_HAVE_KVM_PM_NOTIFIER=y
@@ -6388,6 +6388,7 @@ CONFIG_HID_THRUSTMASTER=m
63886388
# CONFIG_THRUSTMASTER_FF is not set
63896389
# CONFIG_HID_UDRAW_PS3 is not set
63906390
# CONFIG_HID_U2FZERO is not set
6391+
# CONFIG_HID_UNIVERSAL_PIDFF is not set
63916392
CONFIG_HID_WACOM=m
63926393
CONFIG_HID_WIIMOTE=m
63936394
# CONFIG_HID_WINWING is not set
@@ -7099,7 +7100,7 @@ CONFIG_MLX5_VFIO_PCI=m
70997100
# end of VFIO support for PCI devices
71007101

71017102
CONFIG_VFIO_MDEV=m
7102-
CONFIG_IRQ_BYPASS_MANAGER=y
7103+
CONFIG_IRQ_BYPASS_MANAGER=m
71037104
CONFIG_VIRT_DRIVERS=y
71047105
CONFIG_VMGENID=y
71057106
# CONFIG_VBOXGUEST is not set

‎ciq/configs/kernel-x86_64.config‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86_64 6.12.23 Kernel Configuration
3+
# Linux/x86_64 6.12.24 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -774,7 +774,7 @@ CONFIG_KVM_VFIO=y
774774
CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
775775
CONFIG_KVM_GENERIC_PRE_FAULT_MEMORY=y
776776
CONFIG_KVM_COMPAT=y
777-
CONFIG_HAVE_KVM_IRQ_BYPASS=y
777+
CONFIG_HAVE_KVM_IRQ_BYPASS=m
778778
CONFIG_HAVE_KVM_NO_POLL=y
779779
CONFIG_KVM_XFER_TO_GUEST_WORK=y
780780
CONFIG_HAVE_KVM_PM_NOTIFIER=y
@@ -6367,6 +6367,7 @@ CONFIG_HID_THRUSTMASTER=m
63676367
# CONFIG_THRUSTMASTER_FF is not set
63686368
# CONFIG_HID_UDRAW_PS3 is not set
63696369
# CONFIG_HID_U2FZERO is not set
6370+
# CONFIG_HID_UNIVERSAL_PIDFF is not set
63706371
CONFIG_HID_WACOM=m
63716372
CONFIG_HID_WIIMOTE=m
63726373
# CONFIG_HID_WINWING is not set
@@ -7077,7 +7078,7 @@ CONFIG_MLX5_VFIO_PCI=m
70777078
# end of VFIO support for PCI devices
70787079

70797080
CONFIG_VFIO_MDEV=m
7080-
CONFIG_IRQ_BYPASS_MANAGER=y
7081+
CONFIG_IRQ_BYPASS_MANAGER=m
70817082
CONFIG_VIRT_DRIVERS=y
70827083
CONFIG_VMGENID=y
70837084
# CONFIG_VBOXGUEST is not set

0 commit comments

Comments
 (0)