summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_KEYBOARD_SNVS_PWRKEY1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_FUNCTION_GRAPH_TRACER1
-rw-r--r--kernel-aarch64-debug.config1
-rw-r--r--kernel-aarch64.config1
-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.spec7
-rw-r--r--sources3
10 files changed, 14 insertions, 8 deletions
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_KEYBOARD_SNVS_PWRKEY b/configs/fedora/generic/arm/aarch64/CONFIG_KEYBOARD_SNVS_PWRKEY
new file mode 100644
index 000000000..3e207e298
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_KEYBOARD_SNVS_PWRKEY
@@ -0,0 +1 @@
+CONFIG_KEYBOARD_SNVS_PWRKEY=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_FUNCTION_GRAPH_TRACER b/configs/fedora/generic/arm/armv7/CONFIG_FUNCTION_GRAPH_TRACER
new file mode 100644
index 000000000..6750cd8d3
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_FUNCTION_GRAPH_TRACER
@@ -0,0 +1 @@
+# CONFIG_FUNCTION_GRAPH_TRACER is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 792652a71..054f37de6 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2884,6 +2884,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
CONFIG_KEYBOARD_QT1070=m
# CONFIG_KEYBOARD_QT2160 is not set
# CONFIG_KEYBOARD_SAMSUNG is not set
+CONFIG_KEYBOARD_SNVS_PWRKEY=m
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUN4I_LRADC is not set
# CONFIG_KEYBOARD_SUNKBD is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 561f7593b..61d4f270b 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2866,6 +2866,7 @@ CONFIG_KEYBOARD_PMIC8XXX=m
CONFIG_KEYBOARD_QT1070=m
# CONFIG_KEYBOARD_QT2160 is not set
# CONFIG_KEYBOARD_SAMSUNG is not set
+CONFIG_KEYBOARD_SNVS_PWRKEY=m
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUN4I_LRADC is not set
# CONFIG_KEYBOARD_SUNKBD is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index c5b40f970..5ba96e019 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1905,7 +1905,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
CONFIG_FTRACE_SYSCALLS=y
CONFIG_FTRACE=y
# CONFIG_FTWDT010_WATCHDOG is not set
-CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_FUNCTION_GRAPH_TRACER is not set
CONFIG_FUNCTION_PROFILER=y
CONFIG_FUNCTION_TRACER=y
CONFIG_FUSE_FS=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index b270f66a5..0a3fc504f 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1835,7 +1835,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
CONFIG_FTRACE_SYSCALLS=y
CONFIG_FTRACE=y
# CONFIG_FTWDT010_WATCHDOG is not set
-CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_FUNCTION_GRAPH_TRACER is not set
CONFIG_FUNCTION_PROFILER=y
CONFIG_FUNCTION_TRACER=y
CONFIG_FUSE_FS=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 2d0971e8e..9461c7a3c 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1820,7 +1820,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
CONFIG_FTRACE_SYSCALLS=y
CONFIG_FTRACE=y
# CONFIG_FTWDT010_WATCHDOG is not set
-CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_FUNCTION_GRAPH_TRACER is not set
CONFIG_FUNCTION_PROFILER=y
CONFIG_FUNCTION_TRACER=y
CONFIG_FUSE_FS=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index f3f5e6800..42d395266 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1890,7 +1890,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
CONFIG_FTRACE_SYSCALLS=y
CONFIG_FTRACE=y
# CONFIG_FTWDT010_WATCHDOG is not set
-CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_FUNCTION_GRAPH_TRACER is not set
CONFIG_FUNCTION_PROFILER=y
CONFIG_FUNCTION_TRACER=y
CONFIG_FUSE_FS=m
diff --git a/kernel.spec b/kernel.spec
index 38c5899db..6dc5b1a92 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,9 +67,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%global rcrev 6
+%global rcrev 7
# The git snapshot level
-%define gitrev 4
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -1819,6 +1819,9 @@ fi
#
#
%changelog
+* Mon Apr 29 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc7.git0.1
+- Linux v5.1-rc7
+
* Mon Apr 29 2019 Jeremy Cline <jcline@redhat.com>
- Disable debugging options.
diff --git a/sources b/sources
index 8b00b8f2c..66a1cb8e0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0
-SHA512 (patch-5.1-rc6.xz) = 5494f2ce8f9b7090b7824501e5bef051cc7fd1d90864ca054e834ea162aefbe9e0d9fa4419d49c004cdba3fc1b1b8033a902c100e2f11414b56ac541c50ed29e
-SHA512 (patch-5.1-rc6-git4.xz) = 40a1f66065179f7b8bc721994bdc35a76c896a11031e234c4c56952bc0381a32d8a87195ac52d017caeb6e0150c93410ab8f828a0fd0ea96eb81585376388d7d
+SHA512 (patch-5.1-rc7.xz) = 8e2c0f9843f08c9911ca14dedaed48ee1995bb12aec9b1e718d3f4cc23d8a0e8d21c368d40f78a43dcdea628e617a190344f0b6c63a4311a36d906da84d98702