summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-06-26 22:25:57 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2018-06-26 22:25:57 +0200
commitcb7506ff941cc7b5cbfc5c218f062321c1f3ab86 (patch)
tree340164c63d0eeeb9f7a71f315c620f048166f4d6
parent03ac5f2dd160320d3b00a852586f0d5c3a06dd88 (diff)
parent8a409ef28234d65a8245039726b13f9975eb210e (diff)
downloadkernel-cb7506ff941cc7b5cbfc5c218f062321c1f3ab86.tar.gz
kernel-cb7506ff941cc7b5cbfc5c218f062321c1f3ab86.tar.xz
kernel-cb7506ff941cc7b5cbfc5c218f062321c1f3ab86.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.18.0-0.rc2.git2.1.vanilla.knurd.1.fc28
Diffstat
-rw-r--r--configs/fedora/generic/CONFIG_LEDS_PCA95322
-rw-r--r--configs/fedora/generic/CONFIG_LEDS_PCA9532_GPIO1
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config3
-rw-r--r--kernel-aarch64.config3
-rw-r--r--kernel-armv7hl-debug.config3
-rw-r--r--kernel-armv7hl-lpae-debug.config3
-rw-r--r--kernel-armv7hl-lpae.config3
-rw-r--r--kernel-armv7hl.config3
-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-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.spec17
-rw-r--r--sources1
23 files changed, 55 insertions, 22 deletions
diff --git a/configs/fedora/generic/CONFIG_LEDS_PCA9532 b/configs/fedora/generic/CONFIG_LEDS_PCA9532
index 1c43dff33..a04d84bf8 100644
--- a/configs/fedora/generic/CONFIG_LEDS_PCA9532
+++ b/configs/fedora/generic/CONFIG_LEDS_PCA9532
@@ -1 +1 @@
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532=m
diff --git a/configs/fedora/generic/CONFIG_LEDS_PCA9532_GPIO b/configs/fedora/generic/CONFIG_LEDS_PCA9532_GPIO
new file mode 100644
index 000000000..f238c8781
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_LEDS_PCA9532_GPIO
@@ -0,0 +1 @@
+CONFIG_LEDS_PCA9532_GPIO=y
diff --git a/gitrev b/gitrev
index efd3f2063..3554b018d 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-894b8c000ae6c106cc434ee0000dfb77df8bd9db
+813835028e9ae1f18cd11bb0ec591d0f0577d96a
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 8a6bf510a..eb4da2d7c 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2951,7 +2951,8 @@ CONFIG_LEDS_MLXREG=m
# CONFIG_LEDS_NET48XX is not set
CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
CONFIG_LEDS_PWM=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 4f87ebc5f..343db8365 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2931,7 +2931,8 @@ CONFIG_LEDS_MLXREG=m
# CONFIG_LEDS_NET48XX is not set
CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
CONFIG_LEDS_PWM=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index df75608e2..fd2351d8d 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3105,7 +3105,8 @@ CONFIG_LEDS_MLXREG=m
CONFIG_LEDS_NIC78BX=m
CONFIG_LEDS_NS2=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
CONFIG_LEDS_PM8058=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index e736900dd..317570643 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2965,7 +2965,8 @@ CONFIG_LEDS_MLXREG=m
CONFIG_LEDS_NIC78BX=m
CONFIG_LEDS_NS2=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
CONFIG_LEDS_PWM=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 30bef0eb2..bc33a767e 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2945,7 +2945,8 @@ CONFIG_LEDS_MLXREG=m
CONFIG_LEDS_NIC78BX=m
CONFIG_LEDS_NS2=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
CONFIG_LEDS_PWM=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 095368002..218015c6b 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3085,7 +3085,8 @@ CONFIG_LEDS_MLXREG=m
CONFIG_LEDS_NIC78BX=m
CONFIG_LEDS_NS2=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
CONFIG_LEDS_PM8058=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index f3dd6d7d3..7d5ecdec4 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -2803,7 +2803,8 @@ CONFIG_LEDS_MLXREG=m
# CONFIG_LEDS_NET48XX is not set
CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_PWM is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 84896b076..faae078ee 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -2826,7 +2826,8 @@ CONFIG_LEDS_MLXREG=m
# CONFIG_LEDS_NET48XX is not set
CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_PWM is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 496dc095d..044913ec9 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2826,7 +2826,8 @@ CONFIG_LEDS_MLXREG=m
# CONFIG_LEDS_NET48XX is not set
CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_PWM is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index c13b9e470..4f75b5306 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2803,7 +2803,8 @@ CONFIG_LEDS_MLXREG=m
# CONFIG_LEDS_NET48XX is not set
CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_PWM is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index e8d570e12..78071602b 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -2669,7 +2669,8 @@ CONFIG_LEDS_MLXREG=m
# CONFIG_LEDS_NET48XX is not set
CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
CONFIG_LEDS_POWERNV=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 32759ea6f..746578c13 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -2646,7 +2646,8 @@ CONFIG_LEDS_MLXREG=m
# CONFIG_LEDS_NET48XX is not set
CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
CONFIG_LEDS_POWERNV=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index d490a5199..7489ac1be 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2614,7 +2614,8 @@ CONFIG_LEDS_MLXREG=m
# CONFIG_LEDS_NET48XX is not set
CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
CONFIG_LEDS_POWERNV=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 1a7d4169c..4d529dc50 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2591,7 +2591,8 @@ CONFIG_LEDS_MLXREG=m
# CONFIG_LEDS_NET48XX is not set
CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
CONFIG_LEDS_POWERNV=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 0a6abd672..19f40ee11 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2561,7 +2561,8 @@ CONFIG_LEDS_MLXREG=m
# CONFIG_LEDS_NET48XX is not set
CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_PWM is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 31feba7c9..a88e32426 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2538,7 +2538,8 @@ CONFIG_LEDS_MLXREG=m
# CONFIG_LEDS_NET48XX is not set
CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_PWM is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index a1acfb20f..87ad04d42 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2886,7 +2886,8 @@ CONFIG_LEDS_MLXREG=m
# CONFIG_LEDS_NET48XX is not set
CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_PWM is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 5bfe5c7a2..31737d452 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2863,7 +2863,8 @@ CONFIG_LEDS_MLXREG=m
# CONFIG_LEDS_NET48XX is not set
CONFIG_LEDS_NIC78BX=m
# CONFIG_LEDS_OT200 is not set
-# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_PWM is not set
diff --git a/kernel.spec b/kernel.spec
index 6152b82ea..9e339de94 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 0
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -130,7 +130,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
%if %{with_verbose}
%define make_opts V=1
@@ -1863,6 +1863,19 @@ fi
#
#
%changelog
+* Tue Jun 26 2018 Laura Abbott <labbott@redhat.com>
+- Enable leds-pca9532 module (rhbz 1595163)
+
+* Tue Jun 26 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc2.git2.1
+- Linux v4.18-rc2-44-g813835028e9a
+
+* Mon Jun 25 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc2.git1.1
+- Linux v4.18-rc2-37-g6f0d349d922b
+- Fix for aarch64 bpf (rhbz 1594447)
+
+* Mon Jun 25 2018 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
* Mon Jun 25 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc2.git0.1
- Linux v4.18-rc2
diff --git a/sources b/sources
index 906d0189f..b20643712 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
SHA512 (patch-4.18-rc2.xz) = d9723a202e43f3e68895fc8463e15b0723f6ecff947805ca501fdf12aa74e87915bc42d1c021d14168814c2178574f3f6f0c2bd770af9653c9e0867ebfaaebe0
+SHA512 (patch-4.18-rc2-git2.xz) = fed0e7857a6f3dbdf84c4ed38034f29b2a71dba4c934a38ed1e2e12920aa034e46ab7918df163e78547aa412139c079056ee25d7b67b5b485d5d3dcdd1bd8f6b
generated by cgit (git 2.34.1) at 2024-05-08 15:55:08 +0000