core/linux-armv7-rc to 5.11.rc4-1

core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch

@@ -1,4 +1,4 @@
-From af697786c56d70cb16891d40f5e3353f0b930181 Mon Sep 17 00:00:00 2001
+From 42e09fd36133dd064fac728d0b8d80ddbb219ffb Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
 Subject: [PATCH 1/9] ARM: atags: add support for Marvell's u-boot
@@ -47,5 +47,5 @@ index 25ceda63b284..83578c54975b 100644
  };
  
 -- 
-2.26.1
+2.30.0
 

core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch

@@ -1,4 +1,4 @@
-From 3fc850c61644e017d24129584ac16e065b63cf6c Mon Sep 17 00:00:00 2001
+From c36f74ab5103410009e01d6de01be70958c721a7 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
 Subject: [PATCH 2/9] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
@@ -34,5 +34,5 @@ index 8452753efebe..3393a10741bb 100644
  	}
  
 -- 
-2.26.1
+2.30.0
 

core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch

@@ -1,4 +1,4 @@
-From 58abc77cd0fc0590ca05e039190e7135730d5319 Mon Sep 17 00:00:00 2001
+From 1cc898e76d009e4b381bef9ccbe8822f1ad4c179 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:41:19 -0600
 Subject: [PATCH 3/9] SMILE Plug device tree file
@@ -14,10 +14,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index e6a1cac0bfc7..42d24fced58b 100644
+index ce66ffd5a1bb..8f4062d549e2 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -1280,6 +1280,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
+@@ -1308,6 +1308,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
  	armada-370-db.dtb \
  	armada-370-dlink-dns327l.dtb \
  	armada-370-mirabox.dtb \
@@ -205,5 +205,5 @@ index 000000000000..d01308ab848b
 +	};
 +};
 -- 
-2.26.1
+2.30.0
 

core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch

@@ -1,4 +1,4 @@
-From a26b4b0624a1a4d5391d0a8835024b4f86e925ae Mon Sep 17 00:00:00 2001
+From 35bff27d14f5c3f29e42bf0bcde31dfc820f67a9 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:43:56 -0600
 Subject: [PATCH 4/9] fix mvsdio eMMC timing
@@ -12,7 +12,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
-index cc0752a9df6d..8f86e19eb074 100644
+index 629efbe639c4..c507c064736c 100644
 --- a/drivers/mmc/host/mvsdio.c
 +++ b/drivers/mmc/host/mvsdio.c
 @@ -90,7 +90,7 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data)
@@ -34,5 +34,5 @@ index cc0752a9df6d..8f86e19eb074 100644
  		host->clock = ios->clock;
  		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
 -- 
-2.26.1
+2.30.0
 

core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch

@@ -1,4 +1,4 @@
-From 351d1453ba7d93578c7325ef74916c74d7a36acf Mon Sep 17 00:00:00 2001
+From 5387243844440a0d05f4b75216588a68526aa4c9 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
 Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter
@@ -8,18 +8,18 @@ Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter
  1 file changed, 56 insertions(+)
 
 diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index 3cf4dc3433f9..2040ca14c4a5 100644
+index ea0d5f04dc3a..88ebceb84193 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
-@@ -48,6 +48,7 @@
+@@ -50,6 +50,7 @@
  #define SUSPEND_SUSPEND3		(0x08)
  #define SUSPEND_ALLMODES		(SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
  					 SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
 +#define MAC_ADDR_LEN                    (6)
  
- #define CARRIER_CHECK_DELAY (2 * HZ)
- 
-@@ -70,6 +71,10 @@ static bool turbo_mode = true;
+ struct smsc95xx_priv {
+ 	u32 mac_cr;
+@@ -67,6 +68,10 @@ static bool turbo_mode = true;
  module_param(turbo_mode, bool, 0644);
  MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
  
@@ -30,8 +30,8 @@ index 3cf4dc3433f9..2040ca14c4a5 100644
  static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
  					    u32 *data, int in_pm)
  {
-@@ -899,8 +904,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
- 	return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
+@@ -753,8 +758,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
+ 	return phy_mii_ioctl(netdev->phydev, rq, cmd);
  }
  
 +/* Check the macaddr module parameter for a MAC address */
@@ -87,9 +87,9 @@ index 3cf4dc3433f9..2040ca14c4a5 100644
 +       if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr))
 +               return;
 +
- 	const u8 *mac_addr;
- 
  	/* maybe the boot loader passed the MAC address in devicetree */
+ 	if (!eth_platform_get_mac_address(&dev->udev->dev,
+ 			dev->net->dev_addr)) {
 -- 
-2.26.1
+2.30.0
 

core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch

@@ -1,4 +1,4 @@
-From a0365a1c5612895b855a74c393057a354369fdb9 Mon Sep 17 00:00:00 2001
+From c22b09283934f39b059b42e3c29985ba81bc8af7 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 14 Feb 2015 12:32:27 +0100
 Subject: [PATCH 6/9] set default cubietruck led triggers
@@ -9,7 +9,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
-index 8c8dee6ea461..4f52a11b913e 100644
+index 9109ca0919ad..43460add4609 100644
 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 @@ -78,6 +78,7 @@ leds {
@@ -29,5 +29,5 @@ index 8c8dee6ea461..4f52a11b913e 100644
  	};
  
 -- 
-2.26.1
+2.30.0
 

core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch

@@ -1,4 +1,4 @@
-From c1844b4f0bf533d46d58ff69dbeea2e38afe37eb Mon Sep 17 00:00:00 2001
+From d020dc63065a58f4be4817cba4a36da8334ddafb Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Thu, 11 Aug 2016 00:42:37 -0600
 Subject: [PATCH 7/9] exynos4412-odroid: set higher minimum buck2 regulator
@@ -13,10 +13,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
-index a5c1ce1e396c..daec49c04367 100644
+index 2983e91bc7dd..fbf6c172becf 100644
 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
 +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
-@@ -439,7 +439,7 @@ buck1_reg: BUCK1 {
+@@ -435,7 +435,7 @@ buck1_reg: BUCK1 {
  
  			buck2_reg: BUCK2 {
  				regulator-name = "VDD_ARM";
@@ -26,5 +26,5 @@ index a5c1ce1e396c..daec49c04367 100644
  				regulator-always-on;
  				regulator-boot-on;
 -- 
-2.26.1
+2.30.0
 

core/linux-armv7-rc/0008-ARM-dove-enable-ethernet-on-D3Plug.patch

@@ -1,4 +1,4 @@
-From 8f0ab86e62eab83a2a91a9e7b154827cb7070a46 Mon Sep 17 00:00:00 2001
+From de507dbe4db754f09905800e4d1629bd933d16f5 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 7 May 2017 13:32:25 -0600
 Subject: [PATCH 8/9] ARM: dove: enable ethernet on D3Plug
@@ -27,5 +27,5 @@ index 826026c28f90..a4c9963e1261 100644
  /* Samsung M8G2F eMMC */
  &sdio0 {
 -- 
-2.26.1
+2.30.0
 

core/linux-armv7-rc/0009-USB-Armory-MkII-support.patch

@@ -1,21 +1,21 @@
-From 25001d907a2d914bb9db73daa0e8bad413300b24 Mon Sep 17 00:00:00 2001
+From d174311bd7469ddf9c292ab41f2bca0a21b12ab2 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 11 Aug 2019 12:34:17 -0600
 Subject: [PATCH 9/9] USB Armory MkII support
 
 ---
  arch/arm/boot/dts/Makefile              |   2 +
- arch/arm/boot/dts/imx6ul-usbarmory.dts  | 255 +++++++++++++++++++++++
- arch/arm/boot/dts/imx6ull-usbarmory.dts | 256 ++++++++++++++++++++++++
- 3 files changed, 513 insertions(+)
+ arch/arm/boot/dts/imx6ul-usbarmory.dts  | 256 +++++++++++++++++++++++
+ arch/arm/boot/dts/imx6ull-usbarmory.dts | 257 ++++++++++++++++++++++++
+ 3 files changed, 515 insertions(+)
  create mode 100644 arch/arm/boot/dts/imx6ul-usbarmory.dts
  create mode 100644 arch/arm/boot/dts/imx6ull-usbarmory.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 42d24fced58b..9f6833189962 100644
+index 8f4062d549e2..9af811420ae6 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -614,10 +614,12 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
+@@ -626,11 +626,13 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
  	imx6ul-tx6ul-0010.dtb \
  	imx6ul-tx6ul-0011.dtb \
  	imx6ul-tx6ul-mainboard.dtb \
@@ -23,6 +23,7 @@ index 42d24fced58b..9f6833189962 100644
  	imx6ull-14x14-evk.dtb \
  	imx6ull-colibri-eval-v3.dtb \
  	imx6ull-colibri-wifi-eval-v3.dtb \
+ 	imx6ull-myir-mys-6ulx-eval.dtb \
  	imx6ull-opos6uldev.dtb \
 +	imx6ull-usbarmory.dtb \
  	imx6ull-phytec-segin-ff-rdk-nand.dtb \
@@ -30,10 +31,10 @@ index 42d24fced58b..9f6833189962 100644
  	imx6ull-phytec-segin-lc-rdk-nand.dtb \
 diff --git a/arch/arm/boot/dts/imx6ul-usbarmory.dts b/arch/arm/boot/dts/imx6ul-usbarmory.dts
 new file mode 100644
-index 000000000000..f26344965ae1
+index 000000000000..1fdcd6f611d5
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6ul-usbarmory.dts
-@@ -0,0 +1,255 @@
+@@ -0,0 +1,256 @@
 +/*
 + * USB armory Mk II device tree file
 + * https://github.com/inversepath/usbarmory
@@ -93,6 +94,7 @@ index 000000000000..f26344965ae1
 +	};
 +
 +	memory {
++		device_type = "memory";
 +		reg = <0x80000000 0x20000000>;
 +	};
 +
@@ -291,10 +293,10 @@ index 000000000000..f26344965ae1
 +};
 diff --git a/arch/arm/boot/dts/imx6ull-usbarmory.dts b/arch/arm/boot/dts/imx6ull-usbarmory.dts
 new file mode 100644
-index 000000000000..2d758a805264
+index 000000000000..f74d0296d5f6
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6ull-usbarmory.dts
-@@ -0,0 +1,256 @@
+@@ -0,0 +1,257 @@
 +/*
 + * USB armory Mk II device tree file
 + * https://github.com/inversepath/usbarmory
@@ -354,6 +356,7 @@ index 000000000000..2d758a805264
 +	};
 +
 +	memory {
++		device_type = "memory";
 +		reg = <0x80000000 0x20000000>;
 +	};
 +
@@ -552,5 +555,5 @@ index 000000000000..2d758a805264
 +	status = "okay";
 +};
 -- 
-2.26.1
+2.30.0
 

core/linux-armv7-rc/PKGBUILD

@@ -3,16 +3,16 @@
 
 buildarch=4
 
-_rcver=5.8
-_rcrel=5
-_rcnrel=armv7-x5
+_rcver=5.11
+_rcrel=4
+_rcnrel=armv7-x3
 
 pkgbase=linux-armv7-rc
 _srcname=linux-${_rcver}-rc${_rcrel}
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform (release candidate)"
 pkgver=${_rcver}.rc${_rcrel}
-pkgrel=2
+pkgrel=1
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -35,18 +35,18 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz"
         'kernel_data_key.vbprivk'
         'linux.preset'
         '99-linux.hook')
-md5sums=('4a686548dbb1e0d3b3e519f34f0307a5'
-         '22e5639b59ea6cffd7ee8985bca4c4b2'
-         '3560ea7157c8b9db9da0f3c191374a7a'
-         'c9c987dbb59da7e1f56bef64851fd027'
-         '22cdf44c22cf1f088d0fe409a44a66df'
-         '128a827bb985edee09c7d725afbb240a'
-         '8ab32a14f59072bee1cbbd948e11972c'
-         '3f91b59169f0e2a7b115f54375f12053'
-         '71431621775f479bd086c7d62fb92eff'
-         '09a0b7a88d491f3f32eb9e460ed0aa00'
-         'd0ddca238c20e460fd62ac6562c873b6'
-         '610241793ab12af489ea2bf51aa7a3a7'
+md5sums=('bd6e8d6caf0c6d6724b830dadd2129e6'
+         'fb3431d18eeeaa528877396179e826fc'
+         '6c3c583d8fa165315791216c5dce9fe4'
+         '0b1fac542a49c8756c4c66d55df7a609'
+         '5b303c16f3957d0c79285bcddae34218'
+         '85501c220fbb3c80b5a2836e4764dbe0'
+         '6e791015c502e6931ca1d27a4dde006a'
+         'f704f034ac86b058c58ef82499a0cd0e'
+         'eef2303908ced1604187ae76cdf2b9d0'
+         '56f2d15c883be64c182073744540a7c6'
+         '0e76e8e7d3d6c5961cd7276a4df9f3a3'
+         '888d2dce103f0d04c45f74e12a5b2cb1'
          '4f2379ed84258050edb858ee8d281678'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
@@ -115,7 +115,7 @@ _package() {
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
-  provides=('kernel26' "linux=${pkgver}" "WIREGUARD-MODULE")
+  provides=("linux=${pkgver}" "WIREGUARD-MODULE")
   conflicts=('linux')
   replaces=('linux-mvebu')
   install=${pkgname}.install
@@ -186,14 +186,14 @@ _package-headers() {
   cp -t "${_builddir}" -a include scripts
 
   install -Dt "${_builddir}/arch/${KARCH}" -m644 arch/${KARCH}/Makefile
-  install -Dt "${_builddir}/arch/${KARCH}/kernel" -m644 arch/${KARCH}/kernel/asm-offsets.s arch/$KARCH/kernel/module.lds
+  install -Dt "${_builddir}/arch/${KARCH}/kernel" -m644 arch/${KARCH}/kernel/asm-offsets.s
 
   cp -t "${_builddir}/arch/${KARCH}" -a arch/${KARCH}/include
-  for i in dove exynos omap2; do
+  for i in dove omap2; do
     mkdir -p "${_builddir}/arch/${KARCH}/mach-${i}"
     cp -t "${_builddir}/arch/${KARCH}/mach-${i}" -a arch/$KARCH/mach-${i}/include
   done
-  for i in omap orion samsung versatile; do
+  for i in omap orion versatile; do
     mkdir -p "${_builddir}/arch/${KARCH}/plat-${i}"
     cp -t "${_builddir}/arch/${KARCH}/plat-${i}" -a arch/$KARCH/plat-${i}/include
   done