summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-arm642
-rw-r--r--config-generic1
-rw-r--r--config-x86-generic2
-rw-r--r--gitrev2
-rw-r--r--kernel.spec6
-rw-r--r--sources2
6 files changed, 12 insertions, 3 deletions
diff --git a/config-arm64 b/config-arm64
index 438e832df..dcf8f9135 100644
--- a/config-arm64
+++ b/config-arm64
@@ -200,6 +200,8 @@ CONFIG_DEBUG_SECTION_MISMATCH=y
# CONFIG_VGA_CONSOLE is not set
# CONFIG_HOTPLUG_PCI_SHPC is not set
+# CONFIG_PCI_HOST_THUNDER_PEM is not set
+# CONFIG_PCI_HOST_THUNDER_ECAM is not set
# CONFIG_FSL_MC_BUS is not set
# CONFIG_FUJITSU_ES is not set
diff --git a/config-generic b/config-generic
index 3270067aa..d7476288b 100644
--- a/config-generic
+++ b/config-generic
@@ -110,6 +110,7 @@ CONFIG_PCIEAER_INJECT=m
CONFIG_HOTPLUG_PCI=y
# CONFIG_HOTPLUG_PCI_CPCI is not set
CONFIG_HOTPLUG_PCI_PCIE=y
+# CONFIG_PCIE_DW_PLAT is not set
# CONFIG_SGI_IOC4 is not set
diff --git a/config-x86-generic b/config-x86-generic
index 585472215..6bd4bca3f 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -501,6 +501,8 @@ CONFIG_HYPERV_STORAGE=m
CONFIG_HYPERV_BALLOON=m
CONFIG_FB_HYPERV=m
CONFIG_HYPERV_KEYBOARD=m
+# This is x86_64 only, but we'll lump it here anyway
+CONFIG_PCI_HYPERV=m
# Depends on HOTPLUG_PCI_PCIE
CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
diff --git a/gitrev b/gitrev
index ab75b7980..1ca3a1a0b 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-271ecc5253e2b317d729d366560789cd7f93836c
+63e30271b04c712c684c07567401b61b10d094d4
diff --git a/kernel.spec b/kernel.spec
index e0ce4e0c9..f847e6290 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 5
+%define gitrev 6
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -2143,6 +2143,10 @@ fi
#
#
%changelog
+* Thu Mar 17 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git6.1
+- Linux v4.5-1822-g63e30271b04c
+- PCI, PM+ACPI merges
+
* Wed Mar 16 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git5.1
- Linux v4.5-1523-g271ecc5253e2
- akpm patches (mm subsystem, various)
diff --git a/sources b/sources
index b7ab1994d..c5cc87d06 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
a60d48eee08ec0536d5efb17ca819aef linux-4.5.tar.xz
6f557fe90b800b615c85c2ca04da6154 perf-man-4.5.tar.gz
-b74ca47c2149d5a8cb7bdeeb47c7d7c1 patch-4.5-git5.xz
+44758677a17a4b89b2fa3c26c8292988 patch-4.5-git6.xz