From 26d6ca3d99135fc0709c9cef81fcd297a66dd2eb Mon Sep 17 00:00:00 2001 From: Michal Kubecek Date: Feb 14 2023 20:30:34 +0000 Subject: Merge branches 'users/jlee/master/for-next' and 'users/jslaby/master/for-next' into master Pull config update from Lee Chun-Yi. Pull config update from Jiří Slabý. --- diff --git a/config/arm64/default b/config/arm64/default index 633500c..b124912 100644 --- a/config/arm64/default +++ b/config/arm64/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.2.0-rc5 Kernel Configuration +# Linux/arm64 6.2.0-rc8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -9785,11 +9785,15 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_DVB_AV7110_IR=y CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y +# CONFIG_DVB_BUDGET_PATCH is not set CONFIG_DVB_SP8870=m # CONFIG_VIDEO_HEXIUM_GEMINI is not set # CONFIG_VIDEO_HEXIUM_ORION is not set # CONFIG_VIDEO_MXB is not set -# CONFIG_DVB_BUDGET_CORE is not set +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +# CONFIG_DVB_BUDGET_AV is not set # CONFIG_VIDEO_STKWEBCAM is not set # CONFIG_VIDEO_TM6000 is not set # CONFIG_USB_ZR364XX is not set diff --git a/config/armv6hl/default b/config/armv6hl/default index 6d96318..bc4f1ee 100644 --- a/config/armv6hl/default +++ b/config/armv6hl/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.2.0-rc5 Kernel Configuration +# Linux/arm 6.2.0-rc8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y diff --git a/config/armv7hl/default b/config/armv7hl/default index d36e8f8..0988139 100644 --- a/config/armv7hl/default +++ b/config/armv7hl/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.2.0-rc5 Kernel Configuration +# Linux/arm 6.2.0-rc8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y diff --git a/config/i386/pae b/config/i386/pae index a1a6633..2126116 100644 --- a/config/i386/pae +++ b/config/i386/pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 6.2.0-rc5 Kernel Configuration +# Linux/i386 6.2.0-rc8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -8726,11 +8726,15 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_DVB_AV7110_IR=y CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y +# CONFIG_DVB_BUDGET_PATCH is not set CONFIG_DVB_SP8870=m # CONFIG_VIDEO_HEXIUM_GEMINI is not set # CONFIG_VIDEO_HEXIUM_ORION is not set # CONFIG_VIDEO_MXB is not set -# CONFIG_DVB_BUDGET_CORE is not set +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +# CONFIG_DVB_BUDGET_AV is not set # CONFIG_VIDEO_STKWEBCAM is not set # CONFIG_VIDEO_TM6000 is not set # CONFIG_USB_ZR364XX is not set diff --git a/config/ppc64/default b/config/ppc64/default index 71ed5fc..d7ee6b1 100644 --- a/config/ppc64/default +++ b/config/ppc64/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 6.2.0-rc5 Kernel Configuration +# Linux/powerpc 6.2.0-rc8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -656,7 +656,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_ARCH_WANTS_NO_INSTR=y CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_RSEQ=y @@ -7302,11 +7301,15 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_DVB_AV7110_IR=y CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y +# CONFIG_DVB_BUDGET_PATCH is not set CONFIG_DVB_SP8870=m # CONFIG_VIDEO_HEXIUM_GEMINI is not set # CONFIG_VIDEO_HEXIUM_ORION is not set # CONFIG_VIDEO_MXB is not set -# CONFIG_DVB_BUDGET_CORE is not set +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +# CONFIG_DVB_BUDGET_AV is not set # CONFIG_VIDEO_STKWEBCAM is not set # CONFIG_VIDEO_TM6000 is not set # CONFIG_USB_ZR364XX is not set diff --git a/config/ppc64le/default b/config/ppc64le/default index 5a23f35..12d7feb 100644 --- a/config/ppc64le/default +++ b/config/ppc64le/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 6.2.0-rc5 Kernel Configuration +# Linux/powerpc 6.2.0-rc8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -596,7 +596,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_ARCH_WANTS_NO_INSTR=y CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_RSEQ=y @@ -7153,11 +7152,15 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_DVB_AV7110_IR=y CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y +# CONFIG_DVB_BUDGET_PATCH is not set CONFIG_DVB_SP8870=m # CONFIG_VIDEO_HEXIUM_GEMINI is not set # CONFIG_VIDEO_HEXIUM_ORION is not set # CONFIG_VIDEO_MXB is not set -# CONFIG_DVB_BUDGET_CORE is not set +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +# CONFIG_DVB_BUDGET_AV is not set # CONFIG_VIDEO_STKWEBCAM is not set # CONFIG_VIDEO_TM6000 is not set # CONFIG_USB_ZR364XX is not set diff --git a/config/riscv64/default b/config/riscv64/default index e4d7032..72c626a 100644 --- a/config/riscv64/default +++ b/config/riscv64/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.2.0-rc5 Kernel Configuration +# Linux/riscv 6.2.0-rc8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -7762,11 +7762,15 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_DVB_AV7110_IR=y CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y +# CONFIG_DVB_BUDGET_PATCH is not set CONFIG_DVB_SP8870=m # CONFIG_VIDEO_HEXIUM_GEMINI is not set # CONFIG_VIDEO_HEXIUM_ORION is not set # CONFIG_VIDEO_MXB is not set -# CONFIG_DVB_BUDGET_CORE is not set +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +# CONFIG_DVB_BUDGET_AV is not set # CONFIG_VIDEO_STKWEBCAM is not set # CONFIG_VIDEO_TM6000 is not set # CONFIG_USB_ZR364XX is not set diff --git a/config/s390x/default b/config/s390x/default index 7dc4f7d..a99c4dc 100644 --- a/config/s390x/default +++ b/config/s390x/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 6.2.0-rc5 Kernel Configuration +# Linux/s390 6.2.0-rc8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump index fec0fcf..7b37ad2 100644 --- a/config/s390x/zfcpdump +++ b/config/s390x/zfcpdump @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 6.2.0-rc5 Kernel Configuration +# Linux/s390 6.2.0-rc8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y diff --git a/config/x86_64/default b/config/x86_64/default index 555a64a..fbd0ceb 100644 --- a/config/x86_64/default +++ b/config/x86_64/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.2.0-rc5 Kernel Configuration +# Linux/x86_64 6.2.0-rc8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -8669,11 +8669,15 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_DVB_AV7110_IR=y CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y +# CONFIG_DVB_BUDGET_PATCH is not set CONFIG_DVB_SP8870=m # CONFIG_VIDEO_HEXIUM_GEMINI is not set # CONFIG_VIDEO_HEXIUM_ORION is not set # CONFIG_VIDEO_MXB is not set -# CONFIG_DVB_BUDGET_CORE is not set +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +# CONFIG_DVB_BUDGET_AV is not set # CONFIG_VIDEO_STKWEBCAM is not set # CONFIG_VIDEO_TM6000 is not set # CONFIG_USB_ZR364XX is not set