diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-03-04 13:37:13 -0700 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2021-03-04 22:06:53 +0100 |
commit | 196f3d586f11d96ba4ab60068cfb12420bcd20fd (patch) | |
tree | 4f4eb9cd8c8a229972792286361b5bff8743d993 /target/linux/generic/pending-5.4/465-m25p80-mx-disable-software-protection.patch | |
parent | 1d412235a57f3359d1c7bb63bfebce50c56caee6 (diff) | |
download | upstream-196f3d586f11d96ba4ab60068cfb12420bcd20fd.tar.gz upstream-196f3d586f11d96ba4ab60068cfb12420bcd20fd.tar.bz2 upstream-196f3d586f11d96ba4ab60068cfb12420bcd20fd.zip |
kernel-5.4: bump to 5.4.102 and refresh patches
5.4.102 backported a lot of stuff that our WireGuard backport already
did, in addition to other patches we had, so those patches were
removed from that part of the series. In the process other patches were
refreshed or reworked to account for upstream changes.
This commit involved `update_kernel.sh -v -u 5.4`.
Cc: John Audia <graysky@archlinux.us>
Cc: David Bauer <mail@david-bauer.net>
Cc: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'target/linux/generic/pending-5.4/465-m25p80-mx-disable-software-protection.patch')
-rw-r--r-- | target/linux/generic/pending-5.4/465-m25p80-mx-disable-software-protection.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/pending-5.4/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/pending-5.4/465-m25p80-mx-disable-software-protection.patch index 7c11ad356b..24d2d4567d 100644 --- a/target/linux/generic/pending-5.4/465-m25p80-mx-disable-software-protection.patch +++ b/target/linux/generic/pending-5.4/465-m25p80-mx-disable-software-protection.patch @@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -4883,6 +4883,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -4884,6 +4884,7 @@ int spi_nor_scan(struct spi_nor *nor, co */ if (JEDEC_MFR(nor->info) == SNOR_MFR_ATMEL || JEDEC_MFR(nor->info) == SNOR_MFR_INTEL || |