summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--baseconfig/CONFIG_CFG80211_CRDA_SUPPORT1
-rw-r--r--baseconfig/CONFIG_LPFC_NVME_INITIATOR1
-rw-r--r--baseconfig/CONFIG_LPFC_NVME_TARGET1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC1
-rw-r--r--baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC_CONSOLE1
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config3
-rw-r--r--kernel-aarch64.config3
-rw-r--r--kernel-armv7hl-debug.config6
-rw-r--r--kernel-armv7hl-lpae-debug.config6
-rw-r--r--kernel-armv7hl-lpae.config6
-rw-r--r--kernel-armv7hl.config6
-rw-r--r--kernel-i686-PAE.config3
-rw-r--r--kernel-i686-PAEdebug.config3
-rw-r--r--kernel-i686-debug.config3
-rw-r--r--kernel-i686.config3
-rw-r--r--kernel-ppc64-debug.config3
-rw-r--r--kernel-ppc64.config3
-rw-r--r--kernel-ppc64le-debug.config3
-rw-r--r--kernel-ppc64le.config3
-rw-r--r--kernel-ppc64p7-debug.config3
-rw-r--r--kernel-ppc64p7.config3
-rw-r--r--kernel-s390x-debug.config3
-rw-r--r--kernel-s390x.config3
-rw-r--r--kernel-x86_64-debug.config3
-rw-r--r--kernel-x86_64.config3
-rw-r--r--kernel.spec14
-rw-r--r--sources2
28 files changed, 88 insertions, 7 deletions
diff --git a/baseconfig/CONFIG_CFG80211_CRDA_SUPPORT b/baseconfig/CONFIG_CFG80211_CRDA_SUPPORT
new file mode 100644
index 000000000..51f113cca
--- /dev/null
+++ b/baseconfig/CONFIG_CFG80211_CRDA_SUPPORT
@@ -0,0 +1 @@
+CONFIG_CFG80211_CRDA_SUPPORT=y
diff --git a/baseconfig/CONFIG_LPFC_NVME_INITIATOR b/baseconfig/CONFIG_LPFC_NVME_INITIATOR
new file mode 100644
index 000000000..cfa87b693
--- /dev/null
+++ b/baseconfig/CONFIG_LPFC_NVME_INITIATOR
@@ -0,0 +1 @@
+CONFIG_LPFC_NVME_INITIATOR=y
diff --git a/baseconfig/CONFIG_LPFC_NVME_TARGET b/baseconfig/CONFIG_LPFC_NVME_TARGET
new file mode 100644
index 000000000..ebf8bd16d
--- /dev/null
+++ b/baseconfig/CONFIG_LPFC_NVME_TARGET
@@ -0,0 +1 @@
+CONFIG_LPFC_NVME_TARGET=y
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC b/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC
new file mode 100644
index 000000000..9ac7f69ac
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC
@@ -0,0 +1 @@
+CONFIG_SERIAL_ST_ASC=y
diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC_CONSOLE b/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC_CONSOLE
new file mode 100644
index 000000000..4f7f87761
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SERIAL_ST_ASC_CONSOLE
@@ -0,0 +1 @@
+CONFIG_SERIAL_ST_ASC_CONSOLE=y
diff --git a/gitrev b/gitrev
index 0d4b2338f..945737f03 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-ae50dfd61665086e617cc9e554a1285d52765670
+69eea5a4ab9c705496e912b55a9d312325de19e6
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 4747bcd58..ada543892 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -747,6 +747,7 @@ CONFIG_CEPH_LIB_PRETTYDEBUG=y
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2724,6 +2725,8 @@ CONFIG_LOOPBACK_TARGET=m
# CONFIG_LPC_ICH is not set
CONFIG_LP_CONSOLE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 7becd1ab7..2b5d9b5d3 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -747,6 +747,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2705,6 +2706,8 @@ CONFIG_LOOPBACK_TARGET=m
# CONFIG_LPC_ICH is not set
CONFIG_LP_CONSOLE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 2ef6d5a0c..22c119b09 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -794,6 +794,7 @@ CONFIG_CEPH_LIB_PRETTYDEBUG=y
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2925,6 +2926,8 @@ CONFIG_LOOPBACK_TARGET=m
# CONFIG_LPC_ICH is not set
CONFIG_LP_CONSOLE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=32768
# CONFIG_LTC2485 is not set
@@ -5221,7 +5224,8 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_SAMSUNG=y
# CONFIG_SERIAL_SC16IS7XX is not set
# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_ST_ASC is not set
+CONFIG_SERIAL_ST_ASC_CONSOLE=y
+CONFIG_SERIAL_ST_ASC=y
CONFIG_SERIAL_TEGRA=y
# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_SERIAL_UARTLITE_CONSOLE=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 669d9ceee..ed4a73696 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -772,6 +772,7 @@ CONFIG_CEPH_LIB_PRETTYDEBUG=y
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2801,6 +2802,8 @@ CONFIG_LOOPBACK_TARGET=m
# CONFIG_LPC_ICH is not set
CONFIG_LP_CONSOLE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=32768
# CONFIG_LTC2485 is not set
@@ -4927,7 +4930,8 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_SAMSUNG=y
# CONFIG_SERIAL_SC16IS7XX is not set
# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_ST_ASC is not set
+CONFIG_SERIAL_ST_ASC_CONSOLE=y
+CONFIG_SERIAL_ST_ASC=y
CONFIG_SERIAL_TEGRA=y
# CONFIG_SERIAL_TIMBERDALE is not set
# CONFIG_SERIAL_UARTLITE is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index bc8fed4e7..f9acb6216 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -771,6 +771,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2782,6 +2783,8 @@ CONFIG_LOOPBACK_TARGET=m
# CONFIG_LPC_ICH is not set
CONFIG_LP_CONSOLE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=32768
# CONFIG_LTC2485 is not set
@@ -4905,7 +4908,8 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_SAMSUNG=y
# CONFIG_SERIAL_SC16IS7XX is not set
# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_ST_ASC is not set
+CONFIG_SERIAL_ST_ASC_CONSOLE=y
+CONFIG_SERIAL_ST_ASC=y
CONFIG_SERIAL_TEGRA=y
# CONFIG_SERIAL_TIMBERDALE is not set
# CONFIG_SERIAL_UARTLITE is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 6550ab4d4..78501638d 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -793,6 +793,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2906,6 +2907,8 @@ CONFIG_LOOPBACK_TARGET=m
# CONFIG_LPC_ICH is not set
CONFIG_LP_CONSOLE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=32768
# CONFIG_LTC2485 is not set
@@ -5199,7 +5202,8 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_SAMSUNG=y
# CONFIG_SERIAL_SC16IS7XX is not set
# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_ST_ASC is not set
+CONFIG_SERIAL_ST_ASC_CONSOLE=y
+CONFIG_SERIAL_ST_ASC=y
CONFIG_SERIAL_TEGRA=y
# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_SERIAL_UARTLITE_CONSOLE=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 5368ca765..20921a84f 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -661,6 +661,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2641,6 +2642,8 @@ CONFIG_LOOPBACK_TARGET=m
CONFIG_LPC_ICH=m
CONFIG_LP_CONSOLE=y
CONFIG_LPC_SCH=m
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 8ebe7ac84..4ee9e062a 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -662,6 +662,7 @@ CONFIG_CEPH_LIB_PRETTYDEBUG=y
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2661,6 +2662,8 @@ CONFIG_LOOPBACK_TARGET=m
CONFIG_LPC_ICH=m
CONFIG_LP_CONSOLE=y
CONFIG_LPC_SCH=m
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index fcc84298b..0461895f9 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -662,6 +662,7 @@ CONFIG_CEPH_LIB_PRETTYDEBUG=y
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2661,6 +2662,8 @@ CONFIG_LOOPBACK_TARGET=m
CONFIG_LPC_ICH=m
CONFIG_LP_CONSOLE=y
CONFIG_LPC_SCH=m
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 3a16f7510..071c9d0b1 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -661,6 +661,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2641,6 +2642,8 @@ CONFIG_LOOPBACK_TARGET=m
CONFIG_LPC_ICH=m
CONFIG_LP_CONSOLE=y
CONFIG_LPC_SCH=m
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 32694d4cb..3a169b672 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -648,6 +648,7 @@ CONFIG_CEPH_LIB_PRETTYDEBUG=y
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2536,6 +2537,8 @@ CONFIG_LPARCFG=y
# CONFIG_LPC_ICH is not set
CONFIG_LP_CONSOLE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 672225cba..83ae60565 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -647,6 +647,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2516,6 +2517,8 @@ CONFIG_LPARCFG=y
# CONFIG_LPC_ICH is not set
CONFIG_LP_CONSOLE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 964132952..91ddfc3c2 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -605,6 +605,7 @@ CONFIG_CEPH_LIB_PRETTYDEBUG=y
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2482,6 +2483,8 @@ CONFIG_LPARCFG=y
# CONFIG_LPC_ICH is not set
CONFIG_LP_CONSOLE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 1d4ca8894..0d32e092d 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -604,6 +604,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2462,6 +2463,8 @@ CONFIG_LPARCFG=y
# CONFIG_LPC_ICH is not set
CONFIG_LP_CONSOLE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 7f2596c63..d86032f89 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -605,6 +605,7 @@ CONFIG_CEPH_LIB_PRETTYDEBUG=y
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2481,6 +2482,8 @@ CONFIG_LPARCFG=y
# CONFIG_LPC_ICH is not set
CONFIG_LP_CONSOLE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index cf065cb3d..eddc66132 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -604,6 +604,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2461,6 +2462,8 @@ CONFIG_LPARCFG=y
# CONFIG_LPC_ICH is not set
CONFIG_LP_CONSOLE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 28df4691d..50df5a9cd 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -603,6 +603,7 @@ CONFIG_CEPH_LIB_PRETTYDEBUG=y
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2423,6 +2424,8 @@ CONFIG_LOOPBACK_TARGET=m
# CONFIG_LPC_ICH is not set
CONFIG_LP_CONSOLE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index d234f2a88..9fb8cd500 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -602,6 +602,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2403,6 +2404,8 @@ CONFIG_LOOPBACK_TARGET=m
# CONFIG_LPC_ICH is not set
CONFIG_LP_CONSOLE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index dba8cf632..2fcb8a3c2 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -666,6 +666,7 @@ CONFIG_CEPH_LIB_PRETTYDEBUG=y
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2697,6 +2698,8 @@ CONFIG_LOOPBACK_TARGET=m
CONFIG_LPC_ICH=m
CONFIG_LP_CONSOLE=y
CONFIG_LPC_SCH=m
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 5fd76079a..f0a76f829 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -665,6 +665,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_CFG80211_CRDA_SUPPORT=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -2677,6 +2678,8 @@ CONFIG_LOOPBACK_TARGET=m
CONFIG_LPC_ICH=m
CONFIG_LP_CONSOLE=y
CONFIG_LPC_SCH=m
+CONFIG_LPFC_NVME_INITIATOR=y
+CONFIG_LPFC_NVME_TARGET=y
CONFIG_LSI_ET1011C_PHY=m
CONFIG_LSM_MMAP_MIN_ADDR=65536
# CONFIG_LTC2485 is not set
diff --git a/kernel.spec b/kernel.spec
index ad23b5f6c..873faa7ba 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 2
# The git snapshot level
-%define gitrev 2
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -2183,6 +2183,18 @@ fi
#
#
%changelog
+* Thu Mar 16 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable STi Serial Console
+
+* Thu Mar 16 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc2.git3.1
+- Linux v4.11-rc2-208-g69eea5a
+
+* Wed Mar 15 2017 Laura Abbott <labbott@fedoraproject.org>
+- Reenable debugging options like nothing ever happened.
+
+* Wed Mar 15 2017 Laura Abbott <labbott@fedoraproject.org>
+- Disable debugging options for sync to f26
+
* Wed Mar 15 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc2.git2.1
- Linux v4.11-rc2-157-gae50dfd
diff --git a/sources b/sources
index 7cd654255..03a4f6241 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90
SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8
SHA512 (patch-4.11-rc2.xz) = 01fcc1e67bba67a1bfef74acea99a52b489cdaf3f6feb59dd4e7719a3a9c07ff3131a754823a283ef50535d730929b4ddd31fa24c6bda2c68c3ad41283db49ec
-SHA512 (patch-4.11-rc2-git2.xz) = 33bb4957191610dc8d5d0fe38fc2fac4a680e46459b4abf8ad9f195eb82a0964931438b28cc73aca9d9418d236603e6d60fadb27f006f52335361ec73aa8840e
+SHA512 (patch-4.11-rc2-git3.xz) = 5a25bf6568075104688d6449a73bd7cd1f59403710c6e4c472f08f69ceac2043f8e01dd8c37dd13c188f2effb955148f80e7ee8da4dc7c86cbb67b6701da18c9