Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-01-17 16:47:12 +0100
committerPetr Tesarik <ptesarik@suse.cz>2019-01-17 16:47:12 +0100
commitc4f6ef7976d10058ad74b124d0117a2c9eaff3c0 (patch)
tree4009c068b4df27f68dde9ee0b60069dde94a768a
parent26d000e6f3e74db5e26a3fa2422ce87c0862d258 (diff)
parent0e4b47719b9db4d7c61b0fb345b819f22a121378 (diff)
Merge branch 'users/msuchanek/SLE15-SP1/for-next' into SLE15-SP1
Pull RPM packaging fixes from Michal Suchanek
-rw-r--r--config/arm64/default2
-rw-r--r--config/ppc64le/default2
-rw-r--r--config/s390x/default2
-rw-r--r--config/s390x/zfcpdump2
-rw-r--r--config/x86_64/default4
-rw-r--r--supported.conf1
6 files changed, 7 insertions, 6 deletions
diff --git a/config/arm64/default b/config/arm64/default
index d4c41305f9..e13a4bc4e4 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -7790,7 +7790,7 @@ CONFIG_SUSE_PRODUCT_SLE=y
# CONFIG_SUSE_PRODUCT_OPENSUSE_TUMBLEWEED is not set
CONFIG_SUSE_PRODUCT_CODE=1
CONFIG_SUSE_VERSION=15
-CONFIG_SUSE_PATCHLEVEL=0
+CONFIG_SUSE_PATCHLEVEL=1
CONFIG_SUSE_AUXRELEASE=0
CONFIG_SUSE_KERNEL_SUPPORTED=y
# CONFIG_SUSE_KERNEL_RELEASED is not set
diff --git a/config/ppc64le/default b/config/ppc64le/default
index 62491e99f8..221a51bc30 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -5513,7 +5513,7 @@ CONFIG_SUSE_PRODUCT_SLE=y
# CONFIG_SUSE_PRODUCT_OPENSUSE_TUMBLEWEED is not set
CONFIG_SUSE_PRODUCT_CODE=1
CONFIG_SUSE_VERSION=15
-CONFIG_SUSE_PATCHLEVEL=0
+CONFIG_SUSE_PATCHLEVEL=1
CONFIG_SUSE_AUXRELEASE=0
CONFIG_SUSE_KERNEL_SUPPORTED=y
# CONFIG_SUSE_KERNEL_RELEASED is not set
diff --git a/config/s390x/default b/config/s390x/default
index 94af8038fc..228823e8af 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -3182,7 +3182,7 @@ CONFIG_SUSE_PRODUCT_SLE=y
# CONFIG_SUSE_PRODUCT_OPENSUSE_TUMBLEWEED is not set
CONFIG_SUSE_PRODUCT_CODE=1
CONFIG_SUSE_VERSION=15
-CONFIG_SUSE_PATCHLEVEL=0
+CONFIG_SUSE_PATCHLEVEL=1
CONFIG_SUSE_AUXRELEASE=0
CONFIG_SUSE_KERNEL_SUPPORTED=y
# CONFIG_SUSE_KERNEL_RELEASED is not set
diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump
index 7fddc74cfe..5ee05005f4 100644
--- a/config/s390x/zfcpdump
+++ b/config/s390x/zfcpdump
@@ -1259,7 +1259,7 @@ CONFIG_SUSE_PRODUCT_SLE=y
# CONFIG_SUSE_PRODUCT_OPENSUSE_TUMBLEWEED is not set
CONFIG_SUSE_PRODUCT_CODE=1
CONFIG_SUSE_VERSION=15
-CONFIG_SUSE_PATCHLEVEL=0
+CONFIG_SUSE_PATCHLEVEL=1
CONFIG_SUSE_AUXRELEASE=0
# CONFIG_SUSE_KERNEL_SUPPORTED is not set
# CONFIG_SUSE_KERNEL_RELEASED is not set
diff --git a/config/x86_64/default b/config/x86_64/default
index 50cb8fcbce..08a354d9e4 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -884,7 +884,7 @@ CONFIG_HOTPLUG_PCI_SHPC=y
#
# PCI host controller drivers
#
-CONFIG_VMD=y
+CONFIG_VMD=m
#
# PCI Endpoint
@@ -7795,7 +7795,7 @@ CONFIG_SUSE_PRODUCT_SLE=y
# CONFIG_SUSE_PRODUCT_OPENSUSE_TUMBLEWEED is not set
CONFIG_SUSE_PRODUCT_CODE=1
CONFIG_SUSE_VERSION=15
-CONFIG_SUSE_PATCHLEVEL=0
+CONFIG_SUSE_PATCHLEVEL=1
CONFIG_SUSE_AUXRELEASE=0
CONFIG_SUSE_KERNEL_SUPPORTED=y
# CONFIG_SUSE_KERNEL_RELEASED is not set
diff --git a/supported.conf b/supported.conf
index fdeff37ec9..11684b7ec5 100644
--- a/supported.conf
+++ b/supported.conf
@@ -1061,6 +1061,7 @@
drivers/media/pci/cx88/cx8800
drivers/media/pci/cx88/cx8802
drivers/media/pci/cx88/cx88xx
+ drivers/pci/host/vmd # FATE#326872
drivers/pci/hotplug/pnv-php # required by cxl/cxlflash
- drivers/media/pci/ivtv/ivtv # Requires firmware, license unclear
- drivers/media/pci/ivtv/ivtvfb # Requires firmware, license unclear