aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-10-02 15:29:16 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-10-02 16:05:34 +0200
commit8cc7ac54b6cfbccf61f31c51313e6480811b5f44 (patch)
tree4a0f1d2c650d837e1fd6a0156827c4a1ac958bf8 /target/linux/x86
parent1c95d78f087c9cd78caf17181525c8853d78bf1c (diff)
downloadupstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.tar.gz
upstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.tar.bz2
upstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.zip
kernel: bump 5.4 to 5.4.150
Manually rebased: generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch generic/pending-5.4/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch Removed upstreamed: generic/backport-5.4/040-ARM-8918-2-only-build-return_address-if-needed.patch layerscape/patches-5.4/819-uart-0004-MLK-18137-fsl_lpuart-Fix-loopback-mode.patch All others updated automatically. Compile-tested on: lantiq/xrx200, armvirt/64 Runtime-tested on: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/patches-5.4/200-pcengines-apu2-reboot.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/x86/patches-5.4/200-pcengines-apu2-reboot.patch b/target/linux/x86/patches-5.4/200-pcengines-apu2-reboot.patch
index 742b6d6ad5..d6f11ac935 100644
--- a/target/linux/x86/patches-5.4/200-pcengines-apu2-reboot.patch
+++ b/target/linux/x86/patches-5.4/200-pcengines-apu2-reboot.patch
@@ -1,6 +1,6 @@
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
-@@ -486,6 +486,16 @@ static const struct dmi_system_id reboot
+@@ -487,6 +487,16 @@ static const struct dmi_system_id reboot
},
},