linux-kernel-lemote: update to 5.4.259

Rebase patches against the newest 5.4 release.

Co-authored-by: Tianhao Chai <[email protected]>

runtime-kernel/linux-kernel-lemote/autobuild/defines

@@ -1,8 +1,8 @@
-PKGNAME=linux-kernel-lemote-5.4.229
+PKGNAME=linux-kernel-lemote-5.4.259
 PKGSEC=kernel
 PKGDEP="dracut firmware-nonfree"
 BUILDDEP="bc git parallel"
-PKGDES="Linux Kernel v5.4.229 modified by Lemote, built for AOSC OS"
+PKGDES="Linux Kernel v5.4.259 modified by Lemote, built for AOSC OS"
 
 ABSTRIP=0
 ABELFDEP=0

runtime-kernel/linux-kernel-lemote/autobuild/patches/0001-mips-vdso-fix-jalr-t9-crash-in-vdso-code.patch

@@ -1,7 +1,7 @@
-From b77b4b1c9bc2455ed302618c98120d324adba04a Mon Sep 17 00:00:00 2001
+From 4fbd3f515c99dcf537162a41788fd6ac1923174a Mon Sep 17 00:00:00 2001
 From: Victor Kamensky <[email protected]>
 Date: Tue, 11 Feb 2020 11:24:33 -0800
-Subject: [PATCH 001/137] mips: vdso: fix 'jalr t9' crash in vdso code
+Subject: [PATCH 001/138] mips: vdso: fix 'jalr t9' crash in vdso code
 
 Observed that when kernel is built with Yocto mips64-poky-linux-gcc,
 and mips64-poky-linux-gnun32-gcc toolchain, resulting vdso contains
@@ -44,7 +44,7 @@ Signed-off-by: Huacai Chen <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile
-index d3cd9c4cadc2..fafca6d95908 100644
+index d3cd9c4ca..fafca6d95 100644
 --- a/arch/mips/vdso/Makefile
 +++ b/arch/mips/vdso/Makefile
 @@ -26,6 +26,7 @@ ccflags-vdso := \
@@ -56,5 +56,5 @@ index d3cd9c4cadc2..fafca6d95908 100644
  	$(call cc-option, -fno-asynchronous-unwind-tables) \
  	$(call cc-option, -fno-stack-protector)
 -- 
-2.37.1 (Apple Git-137.1)
+2.39.1
 

runtime-kernel/linux-kernel-lemote/autobuild/patches/0001-wifi-rt2x00-Condition-interface-type-getters-with-co.patch → runtime-kernel/linux-kernel-lemote/autobuild/patches/0002-wifi-rt2x00-Condition-interface-type-getters-with-co.patch

@@ -1,8 +1,8 @@
-From 0db1d4bd0fe93bd3a90366d5e26aabd2b9d6834d Mon Sep 17 00:00:00 2001
+From 42a073356bccc9296f98681868ee5fe17e1177b5 Mon Sep 17 00:00:00 2001
 From: Jiaxun Yang <[email protected]>
 Date: Thu, 19 Jan 2023 20:42:56 +0000
-Subject: [PATCH] wifi: rt2x00: Condition interface type getters with config
- options
+Subject: [PATCH 002/138] wifi: rt2x00: Condition interface type getters with
+ config options
 
 When compiling this driver for platforms witt partial clk
 support (i.e. MIPS/Loongson64), it will report missing symbol
@@ -18,10 +18,10 @@ Signed-off-by: Jiaxun Yang <[email protected]>
  1 file changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
-index 07a6a5a9ce13..5ccf6ddf283f 100644
+index a90a518b4..010f8e911 100644
 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
-@@ -1174,23 +1174,27 @@ static inline bool rt2x00_intf(struct rt2x00_dev *rt2x00dev,
+@@ -1164,23 +1164,27 @@ static inline bool rt2x00_intf(struct rt2x00_dev *rt2x00dev,
 
  static inline bool rt2x00_is_pci(struct rt2x00_dev *rt2x00dev)
  {
@@ -55,5 +55,5 @@ index 07a6a5a9ce13..5ccf6ddf283f 100644
 
  /* Helpers for capability flags */
 -- 
-2.37.1 (Apple Git-137.1)
+2.39.1
 

runtime-kernel/linux-kernel-lemote/autobuild/patches/0002-mips-vdso-add-build-time-check-that-no-jalr-t9-calls.patch → runtime-kernel/linux-kernel-lemote/autobuild/patches/0003-mips-vdso-add-build-time-check-that-no-jalr-t9-calls.patch

@@ -1,7 +1,7 @@
-From 4bef0730efac934741bd1c7a337ce0e1699b97dc Mon Sep 17 00:00:00 2001
+From 008c45baf74cf7fcedf845dcd3678d29c3020328 Mon Sep 17 00:00:00 2001
 From: Victor Kamensky <[email protected]>
 Date: Tue, 11 Feb 2020 11:24:34 -0800
-Subject: [PATCH 002/137] mips: vdso: add build time check that no 'jalr t9'
+Subject: [PATCH 003/138] mips: vdso: add build time check that no 'jalr t9'
  calls left
 
 vdso shared object cannot have GOT based PIC 'jalr t9' calls
@@ -36,7 +36,7 @@ Signed-off-by: Huacai Chen <[email protected]>
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile
-index fafca6d95908..9a26149f0950 100644
+index fafca6d95..9a26149f0 100644
 --- a/arch/mips/vdso/Makefile
 +++ b/arch/mips/vdso/Makefile
 @@ -74,12 +74,18 @@ CFLAGS_REMOVE_vdso.o = -pg
@@ -60,5 +60,5 @@ index fafca6d95908..9a26149f0950 100644
  quiet_cmd_vdsold = VDSO    $@
        cmd_vdsold = $(CC) $(c_flags) $(VDSO_LDFLAGS) \
 -- 
-2.37.1 (Apple Git-137.1)
+2.39.1
 

runtime-kernel/linux-kernel-lemote/autobuild/patches/0003-MIPS-vdso-Wrap-mexplicit-relocs-in-cc-option.patch → runtime-kernel/linux-kernel-lemote/autobuild/patches/0004-MIPS-vdso-Wrap-mexplicit-relocs-in-cc-option.patch

@@ -1,7 +1,7 @@
-From 620f1b60940d369875a09475f66dc6ea0cc054b5 Mon Sep 17 00:00:00 2001
+From 5d104bb1bf633f4ff7613f852a467b0c624e02d9 Mon Sep 17 00:00:00 2001
 From: Nathan Chancellor <[email protected]>
 Date: Mon, 17 Feb 2020 14:11:49 -0700
-Subject: [PATCH 003/137] MIPS: vdso: Wrap -mexplicit-relocs in cc-option
+Subject: [PATCH 004/138] MIPS: vdso: Wrap -mexplicit-relocs in cc-option
 
 Clang does not support this option and errors out:
 
@@ -36,7 +36,7 @@ Signed-off-by: Huacai Chen <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile
-index 9a26149f0950..649aaa32687e 100644
+index 9a26149f0..649aaa326 100644
 --- a/arch/mips/vdso/Makefile
 +++ b/arch/mips/vdso/Makefile
 @@ -26,7 +26,7 @@ ccflags-vdso := \
@@ -49,5 +49,5 @@ index 9a26149f0950..649aaa32687e 100644
  	$(call cc-option, -fno-asynchronous-unwind-tables) \
  	$(call cc-option, -fno-stack-protector)
 -- 
-2.37.1 (Apple Git-137.1)
+2.39.1
 

runtime-kernel/linux-kernel-lemote/autobuild/patches/0004-MIPS-tlbex-Avoid-access-invalid-address-when-pmd-is-.patch → runtime-kernel/linux-kernel-lemote/autobuild/patches/0005-MIPS-tlbex-Avoid-access-invalid-address-when-pmd-is-.patch

@@ -1,7 +1,7 @@
-From adb06ef6fc484261459e419c414429678b65069e Mon Sep 17 00:00:00 2001
+From 4abb10e39a38079320dfa07d096e03890f81d19a Mon Sep 17 00:00:00 2001
 From: wangrui <[email protected]>
 Date: Mon, 8 Feb 2021 14:59:47 +0800
-Subject: [PATCH 004/137] MIPS: tlbex: Avoid access invalid address when pmd is
+Subject: [PATCH 005/138] MIPS: tlbex: Avoid access invalid address when pmd is
  modifying
 
 When modifying pmd through THP, invalid address access may occurs in the tlb
@@ -32,7 +32,7 @@ Signed-off-by: Huacai Chen <[email protected]>
  1 file changed, 10 insertions(+), 13 deletions(-)
 
 diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
-index 061dc5c97d5a..2130e889231b 100644
+index 061dc5c97..2130e8892 100644
 --- a/arch/mips/mm/tlbex.c
 +++ b/arch/mips/mm/tlbex.c
 @@ -719,11 +719,10 @@ static void
@@ -124,5 +124,5 @@ index 061dc5c97d5a..2130e889231b 100644
  #ifdef CONFIG_SMP
  	uasm_l_smp_pgtable_change(l, *p);
 -- 
-2.37.1 (Apple Git-137.1)
+2.39.1
 

runtime-kernel/linux-kernel-lemote/autobuild/patches/0005-MIPS-Loongson-Add-board_ebase_setup-support.patch → runtime-kernel/linux-kernel-lemote/autobuild/patches/0006-MIPS-Loongson-Add-board_ebase_setup-support.patch

@@ -1,7 +1,7 @@
-From 938d841c226a08db9cba5059a84032ebf9d0a9f5 Mon Sep 17 00:00:00 2001
+From 865c11f599ea5305c8a3d0e61ab06d938c3ca183 Mon Sep 17 00:00:00 2001
 From: Huacai Chen <[email protected]>
 Date: Fri, 25 Oct 2019 09:10:04 +0800
-Subject: [PATCH 005/137] MIPS: Loongson: Add board_ebase_setup() support
+Subject: [PATCH 006/138] MIPS: Loongson: Add board_ebase_setup() support
 
 The EBase registers of old Loongson processor models before 3A2000 are
 32bit and have no WG bit; those of newer models are 64bit and do have
@@ -32,7 +32,7 @@ Signed-off-by: Huacai Chen <[email protected]>
  1 file changed, 11 insertions(+)
 
 diff --git a/arch/mips/loongson64/common/init.c b/arch/mips/loongson64/common/init.c
-index 912fe61c4fc7..8e2047d04e94 100644
+index 912fe61c4..8e2047d04 100644
 --- a/arch/mips/loongson64/common/init.c
 +++ b/arch/mips/loongson64/common/init.c
 @@ -15,6 +15,16 @@
@@ -61,5 +61,5 @@ index 912fe61c4fc7..8e2047d04e94 100644
  }
 
 -- 
-2.37.1 (Apple Git-137.1)
+2.39.1
 

runtime-kernel/linux-kernel-lemote/autobuild/patches/0006-MIPS-Loongson-remove-unnecessary-loongson_llsc_mb.patch → runtime-kernel/linux-kernel-lemote/autobuild/patches/0007-MIPS-Loongson-remove-unnecessary-loongson_llsc_mb.patch

@@ -1,7 +1,7 @@
-From 1454cdbce814da575cabece2855ced6eb9694640 Mon Sep 17 00:00:00 2001
+From 0d5da76ce307e5e2cd54b77c4b194758adb948eb Mon Sep 17 00:00:00 2001
 From: Huacai Chen <[email protected]>
 Date: Mon, 9 Sep 2019 10:15:11 +0800
-Subject: [PATCH 006/137] MIPS: Loongson: remove unnecessary loongson_llsc_mb()
+Subject: [PATCH 007/138] MIPS: Loongson: remove unnecessary loongson_llsc_mb()
 
 Commit 1c6c1ca318585f1 ("mips/atomic: Fix loongson_llsc_mb() wreckage")
 fix the description of Loongson-3's llsc bug and try to add all missing
@@ -44,7 +44,7 @@ Signed-off-by: Huacai Chen <[email protected]>
  3 files changed, 2 insertions(+), 12 deletions(-)
 
 diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
-index bb8658cc7f12..4f6e538e1e08 100644
+index bb8658cc7..4f6e538e1 100644
 --- a/arch/mips/include/asm/atomic.h
 +++ b/arch/mips/include/asm/atomic.h
 @@ -193,7 +193,6 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
@@ -71,7 +71,7 @@ index bb8658cc7f12..4f6e538e1e08 100644
  		: "=&r" (result), "=&r" (temp),
  		  "+" GCC_OFF_SMALL_ASM() (v->counter)
 diff --git a/arch/mips/include/asm/bitops.h b/arch/mips/include/asm/bitops.h
-index 985d6a02f9ea..5016b9646ebc 100644
+index 985d6a02f..5016b9646 100644
 --- a/arch/mips/include/asm/bitops.h
 +++ b/arch/mips/include/asm/bitops.h
 @@ -257,7 +257,6 @@ static inline int test_and_set_bit(unsigned long nr,
@@ -107,7 +107,7 @@ index 985d6a02f9ea..5016b9646ebc 100644
  			__asm__ __volatile__(
  			"	.set	push				\n"
 diff --git a/arch/mips/include/asm/cmpxchg.h b/arch/mips/include/asm/cmpxchg.h
-index 9182ce828f54..8941a8f69953 100644
+index 9182ce828..8941a8f69 100644
 --- a/arch/mips/include/asm/cmpxchg.h
 +++ b/arch/mips/include/asm/cmpxchg.h
 @@ -46,7 +46,6 @@ extern unsigned long __xchg_called_with_bad_pointer(void)
@@ -151,5 +151,5 @@ index 9182ce828f54..8941a8f69953 100644
  	local_irq_restore(flags);
  	return ret;
 -- 
-2.37.1 (Apple Git-137.1)
+2.39.1
 

runtime-kernel/linux-kernel-lemote/autobuild/patches/0007-MIPS-Loongson-Add-CFUCFG-CSR-support.patch → runtime-kernel/linux-kernel-lemote/autobuild/patches/0008-MIPS-Loongson-Add-CFUCFG-CSR-support.patch

@@ -1,7 +1,7 @@
-From 4485a8fdc200df71a3ec1d47a8e031f084781da9 Mon Sep 17 00:00:00 2001
+From d0a9df41f412c7658c0f8243a8d4f5c5b2cd17ea Mon Sep 17 00:00:00 2001
 From: Huacai Chen <[email protected]>
 Date: Thu, 8 Aug 2019 20:59:04 +0800
-Subject: [PATCH 007/137] MIPS: Loongson: Add CFUCFG&CSR support
+Subject: [PATCH 008/138] MIPS: Loongson: Add CFUCFG&CSR support
 
 Loongson-3A R4+ (Loongson-3A4000 and newer) has CPUCFG (CPU config) and
 CSR (Control and Status Register) extensions. This patch add read/write
@@ -16,7 +16,7 @@ Signed-off-by: Jiaxun Yang <[email protected]>
 
 diff --git a/arch/mips/include/asm/mach-loongson64/loongson_regs.h b/arch/mips/include/asm/mach-loongson64/loongson_regs.h
 new file mode 100644
-index 000000000000..6e3569ab8936
+index 000000000..6e3569ab8
 --- /dev/null
 +++ b/arch/mips/include/asm/mach-loongson64/loongson_regs.h
 @@ -0,0 +1,227 @@
@@ -248,5 +248,5 @@ index 000000000000..6e3569ab8936
 +
 +#endif
 -- 
-2.37.1 (Apple Git-137.1)
+2.39.1
 

runtime-kernel/linux-kernel-lemote/autobuild/patches/0008-MIPS-Loongson-Add-Loongson-3A-R4-basic-support.patch → runtime-kernel/linux-kernel-lemote/autobuild/patches/0009-MIPS-Loongson-Add-Loongson-3A-R4-basic-support.patch

@@ -1,7 +1,7 @@
-From 476cedab7f1b2b910eb90ba7b967c39df3c542bc Mon Sep 17 00:00:00 2001
+From ae274ed7333bfa06f8024f8711a77f18c4a06a37 Mon Sep 17 00:00:00 2001
 From: Huacai Chen <[email protected]>
 Date: Fri, 9 Aug 2019 11:13:57 +0800
-Subject: [PATCH 008/137] MIPS: Loongson: Add Loongson-3A R4 basic support
+Subject: [PATCH 009/138] MIPS: Loongson: Add Loongson-3A R4 basic support
 
 All Loongson-3 CPU family:
 
@@ -46,10 +46,10 @@ Signed-off-by: Jiaxun Yang <[email protected]>
  8 files changed, 111 insertions(+), 50 deletions(-)
 
 diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 2811ecc1f3c7..c2cce54c0881 100644
+index a353d1d1b..5f48567f5 100644
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1391,9 +1391,11 @@ config CPU_LOONGSON3
+@@ -1392,9 +1392,11 @@ config CPU_LOONGSON3
  	select CPU_SUPPORTS_64BIT_KERNEL
  	select CPU_SUPPORTS_HIGHMEM
  	select CPU_SUPPORTS_HUGEPAGES
@@ -62,7 +62,7 @@ index 2811ecc1f3c7..c2cce54c0881 100644
  	select MIPS_L1_CACHE_SHIFT_6
  	select MIPS_FP_SUPPORT
 diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
-index 7fddcb8350c6..81ddb575502a 100644
+index 7fddcb835..81ddb5755 100644
 --- a/arch/mips/include/asm/cpu.h
 +++ b/arch/mips/include/asm/cpu.h
 @@ -91,7 +91,9 @@
@@ -77,7 +77,7 @@ index 7fddcb8350c6..81ddb575502a 100644
  #define PRID_IMP_UNKNOWN	0xff00
 
 diff --git a/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h b/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h
-index b5e288a12dfe..b9687320024d 100644
+index b5e288a12..b96873200 100644
 --- a/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h
 +++ b/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h
 @@ -30,13 +30,21 @@
@@ -131,7 +131,7 @@ index b5e288a12dfe..b9687320024d 100644
  	.set	pop
  #endif
 diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
-index f521cbf934e7..671bc6ffea54 100644
+index f521cbf93..671bc6ffe 100644
 --- a/arch/mips/kernel/cpu-probe.c
 +++ b/arch/mips/kernel/cpu-probe.c
 @@ -1526,7 +1526,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
@@ -179,7 +179,7 @@ index f521cbf934e7..671bc6ffea54 100644
  		c->options |= MIPS_CPU_FTLB | MIPS_CPU_TLBINV | MIPS_CPU_LDPTE;
  		c->writecombine = _CACHE_UNCACHED_ACCELERATED;
 diff --git a/arch/mips/kernel/idle.c b/arch/mips/kernel/idle.c
-index eb2afc0b8db1..980d6c39aab3 100644
+index eb2afc0b8..980d6c39a 100644
 --- a/arch/mips/kernel/idle.c
 +++ b/arch/mips/kernel/idle.c
 @@ -179,7 +179,8 @@ void __init check_wait(void)
@@ -193,7 +193,7 @@ index eb2afc0b8db1..980d6c39aab3 100644
  		break;
 
 diff --git a/arch/mips/loongson64/loongson-3/smp.c b/arch/mips/loongson64/loongson-3/smp.c
-index ce68cdaaf33c..e999bb11f065 100644
+index ce68cdaaf..e999bb11f 100644
 --- a/arch/mips/loongson64/loongson-3/smp.c
 +++ b/arch/mips/loongson64/loongson-3/smp.c
 @@ -450,7 +450,7 @@ static void loongson3_cpu_die(unsigned int cpu)
@@ -372,7 +372,7 @@ index ce68cdaaf33c..e999bb11f065 100644
  	mb();
  	play_dead_at_ckseg1(state_addr);
 diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
-index 3375bbe63284..12ada42596e1 100644
+index 3375bbe63..12ada4259 100644
 --- a/arch/mips/mm/c-r4k.c
 +++ b/arch/mips/mm/c-r4k.c
 @@ -1267,7 +1267,8 @@ static void probe_pcache(void)
@@ -386,7 +386,7 @@ index 3375bbe63284..12ada42596e1 100644
  		break;
 
 diff --git a/drivers/platform/mips/cpu_hwmon.c b/drivers/platform/mips/cpu_hwmon.c
-index 3d29a11c1d6b..0d27cb7a9e3c 100644
+index 3d29a11c1..0d27cb7a9 100644
 --- a/drivers/platform/mips/cpu_hwmon.c
 +++ b/drivers/platform/mips/cpu_hwmon.c
 @@ -9,6 +9,9 @@
@@ -438,5 +438,5 @@ index 3d29a11c1d6b..0d27cb7a9e3c 100644
  	if (IS_ERR(cpu_hwmon_dev)) {
  		ret = PTR_ERR(cpu_hwmon_dev);
 -- 
-2.37.1 (Apple Git-137.1)
+2.39.1
 

runtime-kernel/linux-kernel-lemote/autobuild/patches/0009-MIPS-Loongson-3-Add-CSR-IPI-support.patch → runtime-kernel/linux-kernel-lemote/autobuild/patches/0010-MIPS-Loongson-3-Add-CSR-IPI-support.patch

@@ -1,7 +1,7 @@
-From 986b5037bea957a62e0ae5434097f271104c451a Mon Sep 17 00:00:00 2001
+From 09a7951a143bd789eb28b76a034e434f9983016b Mon Sep 17 00:00:00 2001
 From: Huacai Chen <[email protected]>
 Date: Sun, 18 Aug 2019 11:07:51 +0800
-Subject: [PATCH 009/137] MIPS: Loongson-3: Add CSR IPI support
+Subject: [PATCH 010/138] MIPS: Loongson-3: Add CSR IPI support
 
 CSR IPI and legacy MMIO use the same infrastructure, but CSR IPI is
 faster than legacy MMIO IPI. This patch enable CSR IPI if possible
@@ -13,7 +13,7 @@ Signed-off-by: Huacai Chen <[email protected]>
  1 file changed, 62 insertions(+), 8 deletions(-)
 
 diff --git a/arch/mips/loongson64/loongson-3/smp.c b/arch/mips/loongson64/loongson-3/smp.c
-index e999bb11f065..de8e0741ce2d 100644
+index e999bb11f..de8e0741c 100644
 --- a/arch/mips/loongson64/loongson-3/smp.c
 +++ b/arch/mips/loongson64/loongson-3/smp.c
 @@ -18,6 +18,7 @@
@@ -137,5 +137,5 @@ index e999bb11f065..de8e0741ce2d 100644
  	ipi_clear0_regs_init();
  	ipi_status0_regs_init();
 -- 
-2.37.1 (Apple Git-137.1)
+2.39.1
 

runtime-kernel/linux-kernel-lemote/autobuild/patches/0010-MIPS-Loongson-Fix-GENMASK-misuse.patch → runtime-kernel/linux-kernel-lemote/autobuild/patches/0011-MIPS-Loongson-Fix-GENMASK-misuse.patch

@@ -1,7 +1,7 @@
-From 8ece49e05a158582ff391aa1fa4f28b7f0349bf8 Mon Sep 17 00:00:00 2001
+From fdf9089b963d59f9daba6502312d813c1e480c57 Mon Sep 17 00:00:00 2001
 From: Rikard Falkeborn <[email protected]>
 Date: Tue, 22 Oct 2019 21:25:47 +0200
-Subject: [PATCH 010/137] MIPS: Loongson: Fix GENMASK misuse
+Subject: [PATCH 011/138] MIPS: Loongson: Fix GENMASK misuse
 
 Arguments are supposed to be ordered high then low.
 
@@ -24,7 +24,7 @@ Signed-off-by: Huacai Chen <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/mips/include/asm/mach-loongson64/loongson_regs.h b/arch/mips/include/asm/mach-loongson64/loongson_regs.h
-index 6e3569ab8936..363a47a5d26e 100644
+index 6e3569ab8..363a47a5d 100644
 --- a/arch/mips/include/asm/mach-loongson64/loongson_regs.h
 +++ b/arch/mips/include/asm/mach-loongson64/loongson_regs.h
 @@ -86,7 +86,7 @@ static inline u32 read_cpucfg(u32 reg)
@@ -37,5 +37,5 @@ index 6e3569ab8936..363a47a5d26e 100644
  #define LOONGSON_CFG2_LDISBLIKELY	BIT(28)
 
 -- 
-2.37.1 (Apple Git-137.1)
+2.39.1