summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--baseconfig/CONFIG_PCI_ENDPOINT1
-rw-r--r--baseconfig/CONFIG_PCI_ENDPOINT_CONFIGFS1
-rw-r--r--baseconfig/CONFIG_PCI_ENDPOINT_TEST1
-rw-r--r--baseconfig/CONFIG_PCI_EPF_TEST1
-rw-r--r--baseconfig/CONFIG_PCI_SW_SWITCHTEC1
-rw-r--r--baseconfig/arm/CONFIG_PCI_FTPCI1001
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX_EP1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX_HOST1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS1
-rw-r--r--baseconfig/powerpc/CONFIG_SPAPR_TCE_IOMMU2
-rw-r--r--baseconfig/powerpc/CONFIG_VFIO_IOMMU_TYPE11
-rw-r--r--efi-lockdown.patch14
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config6
-rw-r--r--kernel-aarch64.config6
-rw-r--r--kernel-armv7hl-debug.config9
-rw-r--r--kernel-armv7hl-lpae-debug.config6
-rw-r--r--kernel-armv7hl-lpae.config6
-rw-r--r--kernel-armv7hl.config9
-rw-r--r--kernel-i686-PAE.config5
-rw-r--r--kernel-i686-PAEdebug.config5
-rw-r--r--kernel-i686-debug.config5
-rw-r--r--kernel-i686.config5
-rw-r--r--kernel-ppc64-debug.config9
-rw-r--r--kernel-ppc64.config9
-rw-r--r--kernel-ppc64le-debug.config9
-rw-r--r--kernel-ppc64le.config9
-rw-r--r--kernel-ppc64p7-debug.config9
-rw-r--r--kernel-ppc64p7.config9
-rw-r--r--kernel-s390x-debug.config5
-rw-r--r--kernel-s390x.config5
-rw-r--r--kernel-x86_64-debug.config5
-rw-r--r--kernel-x86_64.config5
-rw-r--r--kernel.spec5
-rw-r--r--sources2
35 files changed, 148 insertions, 23 deletions
diff --git a/baseconfig/CONFIG_PCI_ENDPOINT b/baseconfig/CONFIG_PCI_ENDPOINT
new file mode 100644
index 000000000..187b028d7
--- /dev/null
+++ b/baseconfig/CONFIG_PCI_ENDPOINT
@@ -0,0 +1 @@
+CONFIG_PCI_ENDPOINT=y
diff --git a/baseconfig/CONFIG_PCI_ENDPOINT_CONFIGFS b/baseconfig/CONFIG_PCI_ENDPOINT_CONFIGFS
new file mode 100644
index 000000000..9763ac775
--- /dev/null
+++ b/baseconfig/CONFIG_PCI_ENDPOINT_CONFIGFS
@@ -0,0 +1 @@
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
diff --git a/baseconfig/CONFIG_PCI_ENDPOINT_TEST b/baseconfig/CONFIG_PCI_ENDPOINT_TEST
new file mode 100644
index 000000000..ac8854da9
--- /dev/null
+++ b/baseconfig/CONFIG_PCI_ENDPOINT_TEST
@@ -0,0 +1 @@
+# CONFIG_PCI_ENDPOINT_TEST is not set
diff --git a/baseconfig/CONFIG_PCI_EPF_TEST b/baseconfig/CONFIG_PCI_EPF_TEST
new file mode 100644
index 000000000..5b77c0678
--- /dev/null
+++ b/baseconfig/CONFIG_PCI_EPF_TEST
@@ -0,0 +1 @@
+# CONFIG_PCI_EPF_TEST is not set
diff --git a/baseconfig/CONFIG_PCI_SW_SWITCHTEC b/baseconfig/CONFIG_PCI_SW_SWITCHTEC
new file mode 100644
index 000000000..f197a5ed6
--- /dev/null
+++ b/baseconfig/CONFIG_PCI_SW_SWITCHTEC
@@ -0,0 +1 @@
+CONFIG_PCI_SW_SWITCHTEC=m
diff --git a/baseconfig/arm/CONFIG_PCI_FTPCI100 b/baseconfig/arm/CONFIG_PCI_FTPCI100
new file mode 100644
index 000000000..f9fe5b6ea
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PCI_FTPCI100
@@ -0,0 +1 @@
+# CONFIG_PCI_FTPCI100 is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX_EP b/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX_EP
new file mode 100644
index 000000000..1aa92a161
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX_EP
@@ -0,0 +1 @@
+CONFIG_PCI_DRA7XX_EP=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX_HOST b/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX_HOST
new file mode 100644
index 000000000..ad85e3fe7
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX_HOST
@@ -0,0 +1 @@
+CONFIG_PCI_DRA7XX_HOST=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS
new file mode 100644
index 000000000..37161086e
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SERIAL_UARTLITE_NR_UARTS
@@ -0,0 +1 @@
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
diff --git a/baseconfig/powerpc/CONFIG_SPAPR_TCE_IOMMU b/baseconfig/powerpc/CONFIG_SPAPR_TCE_IOMMU
index da6fd2882..ffe83031d 100644
--- a/baseconfig/powerpc/CONFIG_SPAPR_TCE_IOMMU
+++ b/baseconfig/powerpc/CONFIG_SPAPR_TCE_IOMMU
@@ -1 +1 @@
-# CONFIG_SPAPR_TCE_IOMMU is not set
+CONFIG_SPAPR_TCE_IOMMU=y
diff --git a/baseconfig/powerpc/CONFIG_VFIO_IOMMU_TYPE1 b/baseconfig/powerpc/CONFIG_VFIO_IOMMU_TYPE1
new file mode 100644
index 000000000..9f1df8c24
--- /dev/null
+++ b/baseconfig/powerpc/CONFIG_VFIO_IOMMU_TYPE1
@@ -0,0 +1 @@
+# CONFIG_VFIO_IOMMU_TYPE1 is not set
diff --git a/efi-lockdown.patch b/efi-lockdown.patch
index 036985d2b..e04878458 100644
--- a/efi-lockdown.patch
+++ b/efi-lockdown.patch
@@ -800,15 +800,15 @@ index 0666287..b10992c 100644
return 0;
if (off + count > dev->cfg_size) {
@@ -1009,6 +1012,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
- resource_size_t start, end;
- int i;
+ enum pci_mmap_state mmap_type;
+ struct resource *res = &pdev->resource[bar];
+ if (kernel_is_locked_down())
+ return -EPERM;
+
- for (i = 0; i < PCI_ROM_RESOURCE; i++)
- if (res == &pdev->resource[i])
- break;
+ if (res->flags & IORESOURCE_MEM && iomem_is_exclusive(res->start))
+ return -EINVAL;
+
@@ -1108,6 +1114,9 @@ static ssize_t pci_write_resource_io(struct file *filp, struct kobject *kobj,
struct bin_attribute *attr, char *buf,
loff_t off, size_t count)
@@ -845,13 +845,13 @@ index f82710a..139d6f0 100644
ret = pci_domain_nr(dev->bus);
@@ -233,7 +239,7 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
struct pci_filp_private *fpriv = file->private_data;
- int i, ret, write_combine;
+ int i, ret, write_combine = 0, res_bit = IORESOURCE_MEM;
- if (!capable(CAP_SYS_RAWIO))
+ if (!capable(CAP_SYS_RAWIO) || kernel_is_locked_down())
return -EPERM;
- /* Make sure the caller is mapping a real resource for this device */
+ if (fpriv->mmap_state == pci_mmap_io) {
diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c
index 9bf993e..c095247 100644
--- a/drivers/pci/syscall.c
diff --git a/gitrev b/gitrev
index d51921c07..2e3f6b07b 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-13e0988140374123bead1dd27c287354cb95108e
+2868b2513aa732a99ea4a0a6bf10dc93c1f3dac2
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 503101b30..a8ef33093 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3898,10 +3898,15 @@ CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_DW=y
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCIE_QCOM=y
CONFIG_PCIE_ROCKCHIP=y
+# CONFIG_PCI_FTPCI100 is not set
CONFIG_PCI_HERMES=m
CONFIG_PCI_HISI=y
CONFIG_PCI_HOST_GENERIC=y
@@ -3915,6 +3920,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI_TEGRA=y
CONFIG_PCI_XGENE_MSI=y
CONFIG_PCI_XGENE=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 586fbdd8b..54ef50d52 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3877,10 +3877,15 @@ CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_DW=y
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCIE_QCOM=y
CONFIG_PCIE_ROCKCHIP=y
+# CONFIG_PCI_FTPCI100 is not set
CONFIG_PCI_HERMES=m
CONFIG_PCI_HISI=y
CONFIG_PCI_HOST_GENERIC=y
@@ -3894,6 +3899,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI_TEGRA=y
CONFIG_PCI_XGENE_MSI=y
CONFIG_PCI_XGENE=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 6b782fdf1..eee42835e 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4188,6 +4188,8 @@ CONFIG_PCF50633_GPIO=m
# CONFIG_PCH_GBE is not set
CONFIG_PCI_AARDVARK=y
# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_DRA7XX_EP=y
+CONFIG_PCI_DRA7XX_HOST=y
CONFIG_PCI_DRA7XX=y
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
@@ -4199,12 +4201,17 @@ CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_DW=y
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCIE_QCOM=y
CONFIG_PCIE_ROCKCHIP=y
CONFIG_PCIE_XILINX=y
CONFIG_PCI_EXYNOS=y
+# CONFIG_PCI_FTPCI100 is not set
CONFIG_PCI_HERMES=m
CONFIG_PCI_HOST_GENERIC=y
CONFIG_PCI_IMX6=y
@@ -4217,6 +4224,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI_TEGRA=y
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
@@ -5271,6 +5279,7 @@ CONFIG_SERIAL_ST_ASC=y
CONFIG_SERIAL_TEGRA=y
# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_SERIAL_UARTLITE_CONSOLE=y
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
CONFIG_SERIAL_UARTLITE=y
CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
CONFIG_SERIAL_XILINX_PS_UART=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 0bbbcd47c..3804af02d 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3994,10 +3994,15 @@ CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_DW=y
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCIE_ROCKCHIP=y
CONFIG_PCI_EXYNOS=y
+# CONFIG_PCI_FTPCI100 is not set
CONFIG_PCI_HERMES=m
CONFIG_PCI_HOST_GENERIC=y
CONFIG_PCI_IOV=y
@@ -4010,6 +4015,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI_TEGRA=y
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 0b0bd396e..e5e473f2d 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3973,10 +3973,15 @@ CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_DW=y
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCIE_ROCKCHIP=y
CONFIG_PCI_EXYNOS=y
+# CONFIG_PCI_FTPCI100 is not set
CONFIG_PCI_HERMES=m
CONFIG_PCI_HOST_GENERIC=y
CONFIG_PCI_IOV=y
@@ -3989,6 +3994,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI_TEGRA=y
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 6c0f87db8..66e152d7a 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4167,6 +4167,8 @@ CONFIG_PCF50633_GPIO=m
# CONFIG_PCH_GBE is not set
CONFIG_PCI_AARDVARK=y
# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_DRA7XX_EP=y
+CONFIG_PCI_DRA7XX_HOST=y
CONFIG_PCI_DRA7XX=y
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEAER=y
@@ -4178,12 +4180,17 @@ CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_DW=y
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCIE_QCOM=y
CONFIG_PCIE_ROCKCHIP=y
CONFIG_PCIE_XILINX=y
CONFIG_PCI_EXYNOS=y
+# CONFIG_PCI_FTPCI100 is not set
CONFIG_PCI_HERMES=m
CONFIG_PCI_HOST_GENERIC=y
CONFIG_PCI_IMX6=y
@@ -4196,6 +4203,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI_TEGRA=y
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
@@ -5249,6 +5257,7 @@ CONFIG_SERIAL_ST_ASC=y
CONFIG_SERIAL_TEGRA=y
# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_SERIAL_UARTLITE_CONSOLE=y
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
CONFIG_SERIAL_UARTLITE=y
CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
CONFIG_SERIAL_XILINX_PS_UART=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 999023aa2..5d0e69458 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3789,6 +3789,10 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCI_GOANY=y
@@ -3805,6 +3809,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 1481c89ae..aab762e10 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3809,6 +3809,10 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCI_GOANY=y
@@ -3825,6 +3829,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index a40c06b4d..20b227530 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3809,6 +3809,10 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCI_GOANY=y
@@ -3825,6 +3829,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 9d56c5e21..d553b5f8f 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3789,6 +3789,10 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCI_GOANY=y
@@ -3805,6 +3809,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 7b2c81eec..df81c7190 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -3622,6 +3622,10 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCIE_PTM=y
CONFIG_PCI_HERMES=m
@@ -3632,6 +3636,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
@@ -4828,7 +4833,7 @@ CONFIG_SONY_FF=y
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPAPR_TCE_IOMMU is not set
+CONFIG_SPAPR_TCE_IOMMU=y
CONFIG_SPARSE_IRQ=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_SPARSE_RCU_POINTER=y
@@ -5531,7 +5536,7 @@ CONFIG_VETH=m
# CONFIG_VF610_ADC is not set
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
-CONFIG_VFIO_IOMMU_TYPE1=m
+# CONFIG_VFIO_IOMMU_TYPE1 is not set
CONFIG_VFIO=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VFIO_MDEV=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index d7aa3bcd0..47364aba8 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -3600,6 +3600,10 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCIE_PTM=y
CONFIG_PCI_HERMES=m
@@ -3610,6 +3614,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
@@ -4804,7 +4809,7 @@ CONFIG_SONY_FF=y
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPAPR_TCE_IOMMU is not set
+CONFIG_SPAPR_TCE_IOMMU=y
CONFIG_SPARSE_IRQ=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_SPARSE_RCU_POINTER=y
@@ -5507,7 +5512,7 @@ CONFIG_VETH=m
# CONFIG_VF610_ADC is not set
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
-CONFIG_VFIO_IOMMU_TYPE1=m
+# CONFIG_VFIO_IOMMU_TYPE1 is not set
CONFIG_VFIO=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VFIO_MDEV=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 603fd7e7b..f43074b96 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3565,6 +3565,10 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCIE_PTM=y
CONFIG_PCI_HERMES=m
@@ -3575,6 +3579,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
@@ -4757,7 +4762,7 @@ CONFIG_SONY_FF=y
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPAPR_TCE_IOMMU is not set
+CONFIG_SPAPR_TCE_IOMMU=y
CONFIG_SPARSE_IRQ=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_SPARSE_RCU_POINTER=y
@@ -5460,7 +5465,7 @@ CONFIG_VETH=m
# CONFIG_VF610_ADC is not set
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
-CONFIG_VFIO_IOMMU_TYPE1=m
+# CONFIG_VFIO_IOMMU_TYPE1 is not set
CONFIG_VFIO=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VFIO_MDEV=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index f21d15dfd..40daf5094 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3543,6 +3543,10 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCIE_PTM=y
CONFIG_PCI_HERMES=m
@@ -3553,6 +3557,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
@@ -4733,7 +4738,7 @@ CONFIG_SONY_FF=y
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPAPR_TCE_IOMMU is not set
+CONFIG_SPAPR_TCE_IOMMU=y
CONFIG_SPARSE_IRQ=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_SPARSE_RCU_POINTER=y
@@ -5436,7 +5441,7 @@ CONFIG_VETH=m
# CONFIG_VF610_ADC is not set
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
-CONFIG_VFIO_IOMMU_TYPE1=m
+# CONFIG_VFIO_IOMMU_TYPE1 is not set
CONFIG_VFIO=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VFIO_MDEV=m
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index f66714fd0..5e0d46cb1 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -3564,6 +3564,10 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCIE_PTM=y
CONFIG_PCI_HERMES=m
@@ -3574,6 +3578,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
@@ -4756,7 +4761,7 @@ CONFIG_SONY_FF=y
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPAPR_TCE_IOMMU is not set
+CONFIG_SPAPR_TCE_IOMMU=y
CONFIG_SPARSE_IRQ=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_SPARSE_RCU_POINTER=y
@@ -5459,7 +5464,7 @@ CONFIG_VETH=m
# CONFIG_VF610_ADC is not set
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
-CONFIG_VFIO_IOMMU_TYPE1=m
+# CONFIG_VFIO_IOMMU_TYPE1 is not set
CONFIG_VFIO=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VFIO_MDEV=m
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index eb36babc0..e4ccec690 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -3542,6 +3542,10 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCIE_PTM=y
CONFIG_PCI_HERMES=m
@@ -3552,6 +3556,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
@@ -4732,7 +4737,7 @@ CONFIG_SONY_FF=y
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPAPR_TCE_IOMMU is not set
+CONFIG_SPAPR_TCE_IOMMU=y
CONFIG_SPARSE_IRQ=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_SPARSE_RCU_POINTER=y
@@ -5435,7 +5440,7 @@ CONFIG_VETH=m
# CONFIG_VF610_ADC is not set
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=m
-CONFIG_VFIO_IOMMU_TYPE1=m
+# CONFIG_VFIO_IOMMU_TYPE1 is not set
CONFIG_VFIO=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VFIO_MDEV=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index d058d20f5..e93d0f472 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3490,6 +3490,10 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCI_HERMES=m
@@ -3501,6 +3505,7 @@ CONFIG_PCI_PASID=y
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 70a2380ab..1b84c7d7a 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3468,6 +3468,10 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCI_HERMES=m
@@ -3479,6 +3483,7 @@ CONFIG_PCI_PASID=y
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index e96787c20..13467be6e 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3842,6 +3842,10 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCI_HERMES=m
@@ -3854,6 +3858,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 2934150e7..c3a79ee47 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3822,6 +3822,10 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_DPC=y
# CONFIG_PCIE_DW_PLAT is not set
CONFIG_PCIE_ECRC=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_EPF_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCI_HERMES=m
@@ -3834,6 +3838,7 @@ CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PRI=y
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_SW_SWITCHTEC=m
CONFIG_PCI=y
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_3C589=m
diff --git a/kernel.spec b/kernel.spec
index d728b1b2b..43b0e1fd7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 0
# The git snapshot level
-%define gitrev 5
+%define gitrev 6
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -2175,6 +2175,9 @@ fi
#
#
%changelog
+* Tue May 09 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc0.git6.1
+- Linux v4.11-11413-g2868b25
+
* Mon May 08 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc0.git5.1
- Linux v4.11-10603-g13e0988
diff --git a/sources b/sources
index 9c751b3f8..e07efc534 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6
SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
-SHA512 (patch-4.11-git5.xz) = d8c08008563197db1898e36dfbe69098f715541bbbf077ec8579c8eb07ea7183ce7acc819a638e1a8f92b1aba0f4c6e4570c9c262a0b88e50e7fc25ecd7f09ea
+SHA512 (patch-4.11-git6.xz) = 1993c0fb4a8ab1f21bfe79193a674356ee42c49e758e73f5cff9dee52c0ffd44e08227c1f10b40114ecb30d1de6cb6fe64bfdf2bcf92cf679350257dd53aa184