summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-02-15 18:41:17 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2018-02-15 18:41:17 +0100
commitbe462d67bf705de0f38cbf3596a028cf17451107 (patch)
treec56508b0d5c4fdc95fe32d0acf90c3b978173d6d
parentbd097e7f9b459d3db2dd668fd53ba6d04074ab7f (diff)
parent0a39c238e39c31fa53b570206a7a3f75faa51763 (diff)
downloadkernel-be462d67bf705de0f38cbf3596a028cf17451107.tar.gz
kernel-be462d67bf705de0f38cbf3596a028cf17451107.tar.xz
kernel-be462d67bf705de0f38cbf3596a028cf17451107.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.16.0-0.rc1.git3.1.vanilla.knurd.1.fc27
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MB86S7X1
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel.spec11
-rw-r--r--sources2
6 files changed, 12 insertions, 8 deletions
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MB86S7X b/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MB86S7X
new file mode 100644
index 000000000..3c4c7370f
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MB86S7X
@@ -0,0 +1 @@
+CONFIG_GPIO_MB86S7X=m
diff --git a/gitrev b/gitrev
index a6bb49169..79b4771cb 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-178e834c47b0d01352c48730235aae69898fbc02
+e525de3ab04621d227330aa82cd4073c0b0f3579
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 79bfb0fc6..a3ac077a6 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1796,7 +1796,7 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7301 is not set
# CONFIG_GPIO_MAX732X is not set
CONFIG_GPIO_MAX77620=m
-# CONFIG_GPIO_MB86S7X is not set
+CONFIG_GPIO_MB86S7X=m
# CONFIG_GPIO_MC33880 is not set
# CONFIG_GPIO_MCP23S08 is not set
# CONFIG_GPIO_MOCKUP is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 98182b0b3..f3a894090 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1778,7 +1778,7 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7301 is not set
# CONFIG_GPIO_MAX732X is not set
CONFIG_GPIO_MAX77620=m
-# CONFIG_GPIO_MB86S7X is not set
+CONFIG_GPIO_MB86S7X=m
# CONFIG_GPIO_MC33880 is not set
# CONFIG_GPIO_MCP23S08 is not set
# CONFIG_GPIO_MOCKUP is not set
diff --git a/kernel.spec b/kernel.spec
index 3130b4e30..c42e468b1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 1
# The git snapshot level
-%define gitrev 1
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -1684,9 +1684,6 @@ make DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kerne
### clean
###
-%clean
-rm -rf $RPM_BUILD_ROOT
-
###
### scripts
###
@@ -1889,6 +1886,12 @@ fi
#
#
%changelog
+* Thu Feb 15 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc1.git3.1
+- Linux v4.16-rc1-88-ge525de3ab046
+
+* Wed Feb 14 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc1.git2.1
+- Linux v4.16-rc1-32-g6556677a8040
+
* Tue Feb 13 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.16.0-0.rc1.git1.1
- Linux v4.16-rc1-10-g178e834c47b0
- Reenable debugging options.
diff --git a/sources b/sources
index 5c64e668f..ab95b6a08 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
SHA512 (patch-4.16-rc1.xz) = bedbdd6d8e08734083b03ef453e4f46b17016a936ebbd0a1908df7b5a3bdcfc0990d35f4dff83fd83008e4dfe326ccc9f406080cd8818c2d24e20eadaf37598b
-SHA512 (patch-4.16-rc1-git1.xz) = 2a9f1f728bc1440e13692ad88f45e7f02e9291ddaf30cac3eb54fe57a7a8b700160247ee84937093f9f8e9549df5fdd92f491450347375648a514af42838eabc
+SHA512 (patch-4.16-rc1-git3.xz) = cd66333bb7ebd1e9ec62313e55fc61cf4dff550a11b598356ab43fe4dae9fc9293c110a6ec88f5928b0a57bba4d611a6c061f03c76479c12d70e6f29e38f6b60