core/linux-kirkwood-dt to 5.2.0-1

core/linux-kirkwood-dt/0001-leds-trigger-Introduce-a-SATA-trigger.patch

@@ -1,4 +1,4 @@
-From 9ed340dd21bd483e4378c6857ef094fa8cbccd5a Mon Sep 17 00:00:00 2001
+From e864997ecf23e4812fb5f4308ad33ebc1dc47d94 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 25 Feb 2018 16:32:06 -0700
 Subject: [PATCH 1/6] leds: trigger: Introduce a SATA trigger
@@ -13,10 +13,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  create mode 100644 drivers/leds/trigger/ledtrig-sata.c
 
 diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
-index a2559b4fdfff..592f942e0300 100644
+index 7fa9d174a40c..05f75358d20a 100644
 --- a/drivers/leds/trigger/Kconfig
 +++ b/drivers/leds/trigger/Kconfig
-@@ -41,6 +41,12 @@ config LEDS_TRIGGER_DISK
+@@ -39,6 +39,12 @@ config LEDS_TRIGGER_DISK
  	  This allows LEDs to be controlled by disk activity.
  	  If unsure, say Y.
  
@@ -30,7 +30,7 @@ index a2559b4fdfff..592f942e0300 100644
  	bool "LED MTD (NAND/NOR) Trigger"
  	depends on MTD
 diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile
-index f3cfe1950538..f294704a3ebe 100644
+index 733a83e2a718..023b9221202b 100644
 --- a/drivers/leds/trigger/Makefile
 +++ b/drivers/leds/trigger/Makefile
 @@ -2,6 +2,7 @@
@@ -91,10 +91,10 @@ index 000000000000..f1798f43666f
 +}
 +device_initcall(ledtrig_sata_init);
 diff --git a/include/linux/leds.h b/include/linux/leds.h
-index b7e82550e655..065d1b955aca 100644
+index 9b2bf574a17a..72f49e02427c 100644
 --- a/include/linux/leds.h
 +++ b/include/linux/leds.h
-@@ -351,6 +351,12 @@ extern void ledtrig_disk_activity(bool write);
+@@ -392,6 +392,12 @@ extern void ledtrig_disk_activity(bool write);
  static inline void ledtrig_disk_activity(bool write) {}
  #endif
  
@@ -108,5 +108,5 @@ index b7e82550e655..065d1b955aca 100644
  extern void ledtrig_mtd_activity(void);
  #else
 -- 
-2.17.0
+2.21.0
 

core/linux-kirkwood-dt/0002-ata-sata_mv-Add-SATA-activity-LED-trigger-support.patch

@@ -1,4 +1,4 @@
-From 03ee844bfcc06cebc79a94d9a530b3c292e76a64 Mon Sep 17 00:00:00 2001
+From 8067091da992e04ddff2e4250c93b228803400f1 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 25 Feb 2018 16:34:33 -0700
 Subject: [PATCH 2/6] ata: sata_mv: Add SATA activity LED trigger support
@@ -9,10 +9,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
-index 42d4589b43d4..cd3cdd5efc8b 100644
+index da585d2bded6..7aabd13bfa1c 100644
 --- a/drivers/ata/sata_mv.c
 +++ b/drivers/ata/sata_mv.c
-@@ -72,6 +72,7 @@
+@@ -59,6 +59,7 @@
  #include <scsi/scsi_cmnd.h>
  #include <scsi/scsi_device.h>
  #include <linux/libata.h>
@@ -20,7 +20,7 @@ index 42d4589b43d4..cd3cdd5efc8b 100644
  
  #define DRV_NAME	"sata_mv"
  #define DRV_VERSION	"1.28"
-@@ -1175,6 +1176,8 @@ static void mv_start_edma(struct ata_port *ap, void __iomem *port_mmio,
+@@ -1162,6 +1163,8 @@ static void mv_start_edma(struct ata_port *ap, void __iomem *port_mmio,
  {
  	int want_ncq = (protocol == ATA_PROT_NCQ);
  
@@ -30,5 +30,5 @@ index 42d4589b43d4..cd3cdd5efc8b 100644
  		int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
  		if (want_ncq != using_ncq)
 -- 
-2.17.0
+2.21.0
 

core/linux-kirkwood-dt/0003-ARM-dts-kirkwood-pogo_e02-Set-health-LED-to-default-.patch

@@ -1,4 +1,4 @@
-From 5b67bec20e877a5840b0daef862c76d8e6d97581 Mon Sep 17 00:00:00 2001
+From 08a00bb84cd156b1227f7d67177b5316013c51b1 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 25 Feb 2018 16:37:08 -0700
 Subject: [PATCH 3/6] ARM: dts: kirkwood-pogo_e02: Set health LED to default-on
@@ -22,5 +22,5 @@ index f9e95e55f36d..a3ee0ad3c1b4 100644
  		fault {
  			label = "pogo_e02:orange:fault";
 -- 
-2.17.0
+2.21.0
 

core/linux-kirkwood-dt/0004-Fix-mvsdio-SD-card-detection.patch

@@ -1,4 +1,4 @@
-From 75d05cafc03603bd7eaa0aaed192c8ce0be33c12 Mon Sep 17 00:00:00 2001
+From f94bcecd5cb322d2e201ee6bb34eb2dda6301fb4 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 25 Feb 2018 16:38:04 -0700
 Subject: [PATCH 4/6] Fix mvsdio SD card detection
@@ -13,10 +13,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  3 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
-index 121ce50b6d5e..4236a5e8043b 100644
+index 221127324709..f5fa685312db 100644
 --- a/drivers/mmc/core/core.c
 +++ b/drivers/mmc/core/core.c
-@@ -717,7 +717,7 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card)
+@@ -712,7 +712,7 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card)
  			 */
  			limit_us = 3000000;
  		else
@@ -26,10 +26,10 @@ index 121ce50b6d5e..4236a5e8043b 100644
  		/*
  		 * SDHC cards always use these fixed values.
 diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
-index baf3d5da4ccb..f7f1f4f0d2c9 100644
+index d681e8aaca83..318bc37a6816 100644
 --- a/drivers/mmc/core/sd.c
 +++ b/drivers/mmc/core/sd.c
-@@ -356,6 +356,15 @@ int mmc_sd_switch_hs(struct mmc_card *card)
+@@ -376,6 +376,15 @@ int mmc_sd_switch_hs(struct mmc_card *card)
  	if (!status)
  		return -ENOMEM;
  
@@ -46,18 +46,18 @@ index baf3d5da4ccb..f7f1f4f0d2c9 100644
  	if (err)
  		goto out;
 diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
-index 210247b3d11a..05029d5bd72a 100644
+index 74a0a7fbbf7f..db646d337d54 100644
 --- a/drivers/mmc/host/mvsdio.c
 +++ b/drivers/mmc/host/mvsdio.c
-@@ -23,6 +23,7 @@
+@@ -20,6 +20,7 @@
  #include <linux/of_irq.h>
  #include <linux/mmc/host.h>
  #include <linux/mmc/slot-gpio.h>
 +#include <linux/mmc/sd.h>
  
- #include <asm/sizes.h>
+ #include <linux/sizes.h>
  #include <asm/unaligned.h>
-@@ -149,6 +150,7 @@ static void mvsd_request(struct mmc_host *mmc, struct mmc_request *mrq)
+@@ -147,6 +148,7 @@ static void mvsd_request(struct mmc_host *mmc, struct mmc_request *mrq)
  
  	dev_dbg(host->dev, "cmd %d (hw state 0x%04x)\n",
  		cmd->opcode, mvsd_read(MVSD_HW_STATE));
@@ -66,5 +66,5 @@ index 210247b3d11a..05029d5bd72a 100644
  	cmdreg = MVSD_CMD_INDEX(cmd->opcode);
  
 -- 
-2.17.0
+2.21.0
 

core/linux-kirkwood-dt/0005-ARM-dts-kirkwood-Initial-support-for-GoFlex-Home.patch

@@ -1,4 +1,4 @@
-From 8faba79a72828ba3d7181c0354dd865d926ec578 Mon Sep 17 00:00:00 2001
+From 73fc37c74111637069c7424877f21799b14c29ff Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 25 Feb 2018 16:42:40 -0700
 Subject: [PATCH 5/6] ARM: dts: kirkwood: Initial support for GoFlex Home
@@ -11,10 +11,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  create mode 100644 arch/arm/boot/dts/kirkwood-goflexhome.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 7e2424957809..a646fb0f0eda 100644
+index dab2914fa293..5405c0899957 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -248,6 +248,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
+@@ -263,6 +263,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
  	kirkwood-ds411.dtb \
  	kirkwood-ds411j.dtb \
  	kirkwood-ds411slim.dtb \
@@ -156,5 +156,5 @@ index 000000000000..554716fbf367
 +	};
 +};
 -- 
-2.17.0
+2.21.0
 

core/linux-kirkwood-dt/0006-Revert-vfs-mm-fix-a-dead-loop-in-truncate_inode_page.patch

@@ -1,4 +1,4 @@
-From 489658252ab647dd31459d0bf6f059dabaf087b4 Mon Sep 17 00:00:00 2001
+From 8adcca1d4520b2536d7b59e6732e4f739fb7f8d9 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 25 Feb 2018 16:45:51 -0700
 Subject: [PATCH 6/6] Revert "vfs,mm: fix a dead loop in
@@ -13,10 +13,10 @@ device.
  1 file changed, 4 deletions(-)
 
 diff --git a/mm/filemap.c b/mm/filemap.c
-index 0604cb02e6f3..0659f3b9f04f 100644
+index 6dd9a2274c80..e5c167d39c31 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
-@@ -2062,10 +2062,6 @@ static ssize_t generic_file_buffered_read(struct kiocb *iocb,
+@@ -2019,10 +2019,6 @@ static ssize_t generic_file_buffered_read(struct kiocb *iocb,
  	unsigned int prev_offset;
  	int error = 0;
  
@@ -28,5 +28,5 @@ index 0604cb02e6f3..0659f3b9f04f 100644
  	prev_index = ra->prev_pos >> PAGE_SHIFT;
  	prev_offset = ra->prev_pos & (PAGE_SIZE-1);
 -- 
-2.17.0
+2.21.0
 

core/linux-kirkwood-dt/PKGBUILD

@@ -4,10 +4,10 @@
 buildarch=2
 
 pkgbase=linux-kirkwood-dt
-_srcname=linux-5.1
+_srcname=linux-5.2
 _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood DT"
-pkgver=5.1.16
+pkgver=5.2.0
 pkgrel=1
 arch=('arm')
 url="http://www.kernel.org/"
@@ -15,7 +15,7 @@ license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'kmod' 'inetutils' 'bc' 'git')
 options=('!strip')
 source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
-        "http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
+        #"http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
         '0001-leds-trigger-Introduce-a-SATA-trigger.patch'
         '0002-ata-sata_mv-Add-SATA-activity-LED-trigger-support.patch'
         '0003-ARM-dts-kirkwood-pogo_e02-Set-health-LED-to-default-.patch'
@@ -25,15 +25,14 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
         'config'
         'linux.preset'
         '99-linux.hook')
-md5sums=('15fbdff95ff98483069ac6e215b9f4f9'
-         'b403e6f0d4c2deca32cf064166aae4af'
-         '266879c5294611d490e77cea481ccc56'
-         'aa226ccbb7e87d7425fd821853acb963'
-         '0be83f5a22b064a26298c27a6490bf66'
-         'af8d50174d8d1e096224dcc87729a4c9'
-         'e397c1304b5cdeea1dfffd77d37f670e'
-         '32bca55de0649d834bf6cdd8a98326d2'
-         'b0b14dd98c64875b4e8f9f0f35fd6f54'
+md5sums=('ddf994de00d7b18395886dd9b30b9262'
+         '5085b2d587c08fe4129b21b784c5ec72'
+         '1a3ca8cce7b0fdc7e72ecde511023d97'
+         '9a64b38798167ebea717d614875ef44a'
+         'de322923548e24d0811df22daf1192d3'
+         '1bb5e1f081c2333607640c857a5aef6d'
+         '1798736e24f99d840d764ec590b15f7d'
+         '704eb90c6cc0c7e4e8b299bd60d5dda3'
          '959e49540dac4c5e689ad9037150a360'
          '79fa396e3f9a09a85156d6d7c2d34b58')
 
@@ -41,7 +40,7 @@ prepare() {
   cd "${srcdir}/${_srcname}"
  
   # add upstream patch
-  git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
+  #git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
 
   # ALARM patches
   git apply ../0001-leds-trigger-Introduce-a-SATA-trigger.patch