diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-11-28 07:24:15 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-11-28 07:24:15 +0100 |
| commit | 6f1cbf5656501dbba09c0bd727cc1967a18af068 (patch) | |
| tree | 7d89c5d7be96537864441752853fd9d5b3a9e529 | |
| parent | 34ad0848a3900e54f1b84e898352655293b715e1 (diff) | |
| parent | 9ee4e848995952479ddb718a32eb7faf6bb1b137 (diff) | |
| download | kernel-6f1cbf5656501dbba09c0bd727cc1967a18af068.tar.gz kernel-6f1cbf5656501dbba09c0bd727cc1967a18af068.tar.xz kernel-6f1cbf5656501dbba09c0bd727cc1967a18af068.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.15.0-0.rc1.git0.1.vanilla.knurd.1.fc28kernel-4.15.0-0.rc1.git0.1.vanilla.knurd.1.fc27kernel-4.15.0-0.rc1.git0.1.vanilla.knurd.1.fc26kernel-4.15.0-0.rc1.git0.1.vanilla.knurd.1.fc25
| -rw-r--r-- | kernel.spec | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index be92988cb..01afb32ac 100644 --- a/kernel.spec +++ b/kernel.spec @@ -632,7 +632,8 @@ Patch332: arm64-socionext-96b-enablement.patch # 600 - Patches for improved Bay and Cherry Trail device support # Below patches are submitted upstream, awaiting review / merging -Patch601: 0001-Input-gpio_keys-Allow-suppression-of-input-events-fo.patch +# This one needs to be rebased +# Patch601: 0001-Input-gpio_keys-Allow-suppression-of-input-events-fo.patch Patch602: 0002-Input-soc_button_array-Suppress-power-button-presses.patch Patch610: 0010-Input-silead-Add-support-for-capactive-home-button-f.patch @@ -1246,6 +1247,7 @@ git am %{patches} # Any further pre-build tree manipulations happen here. chmod +x scripts/checkpatch.pl +chmod +x tools/objtool/sync-check.sh # This Prevents scripts/setlocalversion from mucking with our version numbers. touch .scmversion |