summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--baseconfig/CONFIG_LPFC_NVME_INITIATOR1
-rw-r--r--baseconfig/CONFIG_LPFC_NVME_TARGET1
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel-i686-PAE.config2
-rw-r--r--kernel-i686-PAEdebug.config2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-ppc64-debug.config2
-rw-r--r--kernel-ppc64.config2
-rw-r--r--kernel-ppc64le-debug.config2
-rw-r--r--kernel-ppc64le.config2
-rw-r--r--kernel-ppc64p7-debug.config2
-rw-r--r--kernel-ppc64p7.config2
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
-rw-r--r--kernel.spec7
-rw-r--r--sources2
25 files changed, 49 insertions, 4 deletions
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/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..b41284cbc 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2724,6 +2724,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..9f71405a8 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2705,6 +2705,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..be6975cd5 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2925,6 +2925,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
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 669d9ceee..cc9f4e418 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2801,6 +2801,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
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index bc8fed4e7..0d421b005 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2782,6 +2782,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
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 6550ab4d4..9e2d16286 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2906,6 +2906,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
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 5368ca765..6a490128f 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -2641,6 +2641,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..02e11d813 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -2661,6 +2661,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..d0ad95b4c 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2661,6 +2661,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..991c1a010 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2641,6 +2641,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..624fa382a 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -2536,6 +2536,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..5b97420f7 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -2516,6 +2516,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..cf097b2c4 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2482,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-ppc64le.config b/kernel-ppc64le.config
index 1d4ca8894..0d8254707 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2462,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-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 7f2596c63..2b4b9d5e1 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -2481,6 +2481,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..a23031246 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -2461,6 +2461,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..64b9ce02a 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2423,6 +2423,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..c808569d8 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2403,6 +2403,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..655d493b3 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2697,6 +2697,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..0e39a96ae 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2677,6 +2677,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 30d87b221..d6aea47be 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 3
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -69,7 +69,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
@@ -2163,6 +2163,9 @@ fi
#
#
%changelog
+* 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.
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