diff options
| author | John Audia <graysky@archlinux.us> | 2021-05-21 06:29:01 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-05-23 15:09:06 +0200 |
| commit | fec92f1ec3d200b0e6ffa299f331a979c7a30a44 (patch) | |
| tree | 1dd43556417007b0dc1e7e65a84acdea069b4662 /target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch | |
| parent | 08593db128c4472225a7ffd58e21f06390d9c3f0 (diff) | |
| download | upstream-fec92f1ec3d200b0e6ffa299f331a979c7a30a44.tar.gz upstream-fec92f1ec3d200b0e6ffa299f331a979c7a30a44.tar.bz2 upstream-fec92f1ec3d200b0e6ffa299f331a979c7a30a44.zip | |
kernel: bump 5.4 to 5.4.120
Removed upstreamed:
generic/pending-5.4/770-02-net-ethernet-mtk_eth_soc-fix-rx-vlan-offload.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Note that since I rebased the previous commit, I removed my Run-tested line
although I confirm building the image successfully.
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch b/target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch index 83c1592df9..4e9598a54e 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0297-arch-arm-Add-model-string-to-cpuinfo.patch @@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c -@@ -1240,6 +1240,8 @@ static int c_show(struct seq_file *m, vo +@@ -1249,6 +1249,8 @@ static int c_show(struct seq_file *m, vo { int i, j; u32 cpuid; @@ -19,7 +19,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> for_each_online_cpu(i) { /* -@@ -1299,6 +1301,14 @@ static int c_show(struct seq_file *m, vo +@@ -1308,6 +1310,14 @@ static int c_show(struct seq_file *m, vo seq_printf(m, "Revision\t: %04x\n", system_rev); seq_printf(m, "Serial\t\t: %s\n", system_serial); |