diff --git a/core/linux-armv7/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/core/linux-armv7/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch index cc345de58..ddd321b23 100644 --- a/core/linux-armv7/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch +++ b/core/linux-armv7/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch @@ -1,7 +1,7 @@ -From 4f3c60e09108eed4a2b25255b94b76261d21d68a Mon Sep 17 00:00:00 2001 +From e74894934f07fb7997d6b61349a2de981ab281d2 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:59:28 +0100 -Subject: [PATCH 01/10] ARM: atags: add support for Marvell's u-boot +Subject: [PATCH 1/9] ARM: atags: add support for Marvell's u-boot Marvell uses a specific atag in its u-boot which includes among other information the MAC addresses for up to 4 network interfaces. diff --git a/core/linux-armv7/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/core/linux-armv7/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch index 373afe9fc..3439ad8ce 100644 --- a/core/linux-armv7/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch +++ b/core/linux-armv7/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -1,8 +1,8 @@ -From 7a39882a2608e6fb9892ef88a31219d9d6e7886f Mon Sep 17 00:00:00 2001 +From 47fc4e3656076db68eedab37cd9aecaedd040408 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:56:58 +0100 -Subject: [PATCH 02/10] ARM: atags/fdt: retrieve MAC addresses from Marvell - boot loader +Subject: [PATCH 2/9] ARM: atags/fdt: retrieve MAC addresses from Marvell boot + loader The atags are parsed and if a Marvell atag is found, up to 4 MAC addresses are extracted there and assigned to node aliases eth0..3 diff --git a/core/linux-armv7/0003-SMILE-Plug-device-tree-file.patch b/core/linux-armv7/0003-SMILE-Plug-device-tree-file.patch index c0e5fc730..db0c2ceee 100644 --- a/core/linux-armv7/0003-SMILE-Plug-device-tree-file.patch +++ b/core/linux-armv7/0003-SMILE-Plug-device-tree-file.patch @@ -1,7 +1,7 @@ -From 0012a712d33f79100e155ceb5e985afac264a85c Mon Sep 17 00:00:00 2001 +From 8336a696a715497bcf117f947de1c7937f30c829 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:41:19 -0600 -Subject: [PATCH 03/10] SMILE Plug device tree file +Subject: [PATCH 3/9] SMILE Plug device tree file This adds a dts file for the SMILE Plug, which only differs from the Mirabox dts with the LED definitions. diff --git a/core/linux-armv7/0004-fix-mvsdio-eMMC-timing.patch b/core/linux-armv7/0004-fix-mvsdio-eMMC-timing.patch index d57a9d455..eca1d2722 100644 --- a/core/linux-armv7/0004-fix-mvsdio-eMMC-timing.patch +++ b/core/linux-armv7/0004-fix-mvsdio-eMMC-timing.patch @@ -1,7 +1,7 @@ -From 68fb4615599903edff61d1e81a6502c6d164c876 Mon Sep 17 00:00:00 2001 +From dc3df983b4bc14c82865fbb1f6f6b139a0d2c0ea Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:43:56 -0600 -Subject: [PATCH 04/10] fix mvsdio eMMC timing +Subject: [PATCH 4/9] fix mvsdio eMMC timing These changes from Globalscale change the MMC timing to allow the eMMC versions of the Mirabox and SMILE Plug to work. diff --git a/core/linux-armv7/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/core/linux-armv7/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index 275919e20..c287e3454 100644 --- a/core/linux-armv7/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/core/linux-armv7/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,8 +1,7 @@ -From 5162a5156a75be1d5d91d4ba095cea10af528d76 Mon Sep 17 00:00:00 2001 +From 8f8892dbbdad6e07ed92ee6a9dfde65b831f6dc0 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Feb 2014 01:43:50 -0300 -Subject: [PATCH 05/10] net/smsc95xx: Allow mac address to be set as a - parameter +Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter --- drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++ diff --git a/core/linux-armv7/0006-set-default-cubietruck-led-triggers.patch b/core/linux-armv7/0006-set-default-cubietruck-led-triggers.patch index d00345b8c..a3167a8ca 100644 --- a/core/linux-armv7/0006-set-default-cubietruck-led-triggers.patch +++ b/core/linux-armv7/0006-set-default-cubietruck-led-triggers.patch @@ -1,7 +1,7 @@ -From af5148212b0ce866dd19b08ba90b2de1626f5558 Mon Sep 17 00:00:00 2001 +From 7b5edc91d8c744869ef75b51500f2b3ab579b8d5 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 14 Feb 2015 12:32:27 +0100 -Subject: [PATCH 06/10] set default cubietruck led triggers +Subject: [PATCH 6/9] set default cubietruck led triggers Signed-off-by: Kevin Mihelich --- diff --git a/core/linux-armv7/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/core/linux-armv7/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch index 5baf31eed..7a5945971 100644 --- a/core/linux-armv7/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch +++ b/core/linux-armv7/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch @@ -1,7 +1,7 @@ -From 2326eea823a657ffc3d43a87b592422583bad325 Mon Sep 17 00:00:00 2001 +From 8a64de6569679c3e6c33a6b63a93a581f1124198 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 11 Aug 2016 00:42:37 -0600 -Subject: [PATCH 07/10] exynos4412-odroid: set higher minimum buck2 regulator +Subject: [PATCH 7/9] exynos4412-odroid: set higher minimum buck2 regulator voltage Set a higher minimum voltage to help reboot issue. diff --git a/core/linux-armv7/0008-ARM-dove-enable-ethernet-on-D3Plug.patch b/core/linux-armv7/0008-ARM-dove-enable-ethernet-on-D3Plug.patch index 55eeac2ac..1e2b71443 100644 --- a/core/linux-armv7/0008-ARM-dove-enable-ethernet-on-D3Plug.patch +++ b/core/linux-armv7/0008-ARM-dove-enable-ethernet-on-D3Plug.patch @@ -1,7 +1,7 @@ -From 5a05d83571952d83abccb076a9aef94f4e620811 Mon Sep 17 00:00:00 2001 +From e57251bad193eaee1c1f78438b8de5f10ab35d52 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 7 May 2017 13:32:25 -0600 -Subject: [PATCH 08/10] ARM: dove: enable ethernet on D3Plug +Subject: [PATCH 8/9] ARM: dove: enable ethernet on D3Plug Signed-off-by: Kevin Mihelich --- diff --git a/core/linux-armv7/0009-USB-Armory-MkII-support.patch b/core/linux-armv7/0009-USB-Armory-MkII-support.patch index 15061bb94..c74a1afb0 100644 --- a/core/linux-armv7/0009-USB-Armory-MkII-support.patch +++ b/core/linux-armv7/0009-USB-Armory-MkII-support.patch @@ -1,7 +1,7 @@ -From d147ebeae31141427142b333626424666a300084 Mon Sep 17 00:00:00 2001 +From 5ab0b47f6e3fcbb16343ad150bfd86eb3f9b25a3 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 11 Aug 2019 12:34:17 -0600 -Subject: [PATCH 09/10] USB Armory MkII support +Subject: [PATCH 9/9] USB Armory MkII support --- arch/arm/boot/dts/Makefile | 2 + diff --git a/core/linux-armv7/0010-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch b/core/linux-armv7/0010-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch deleted file mode 100644 index d67bfe41b..000000000 --- a/core/linux-armv7/0010-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 1fb064aedc2dc74e55e30b0737196f28b19d50ce Mon Sep 17 00:00:00 2001 -From: Chuck Lever -Date: Sun, 31 Jan 2021 16:16:23 -0500 -Subject: [PATCH 10/10] SUNRPC: Fix NFS READs that start at non-page-aligned - offsets - -Anj Duvnjak reports that the Kodi.tv NFS client is not able to read -video files from a v5.10.11 Linux NFS server. - -The new sendpage-based TCP sendto logic was not attentive to non- -zero page_base values. nfsd_splice_read() sets that field when a -READ payload starts in the middle of a page. - -The Linux NFS client rarely emits an NFS READ that is not page- -aligned. All of my testing so far has been with Linux clients, so I -missed this one. - -Reported-by: A. Duvnjak -BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=211471 -Fixes: 4a85a6a3320b ("SUNRPC: Handle TCP socket sends with kernel_sendpage() again") -Signed-off-by: Chuck Lever -Tested-by: A. Duvnjak ---- - net/sunrpc/svcsock.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c -index 4404c491eb38..fa7b7ae2c2c5 100644 ---- a/net/sunrpc/svcsock.c -+++ b/net/sunrpc/svcsock.c -@@ -1113,14 +1113,15 @@ static int svc_tcp_sendmsg(struct socket *sock, struct msghdr *msg, - unsigned int offset, len, remaining; - struct bio_vec *bvec; - -- bvec = xdr->bvec; -- offset = xdr->page_base; -+ bvec = xdr->bvec + (xdr->page_base >> PAGE_SHIFT); -+ offset = offset_in_page(xdr->page_base); - remaining = xdr->page_len; - flags = MSG_MORE | MSG_SENDPAGE_NOTLAST; - while (remaining > 0) { - if (remaining <= PAGE_SIZE && tail->iov_len == 0) - flags = 0; -- len = min(remaining, bvec->bv_len); -+ -+ len = min(remaining, bvec->bv_len - offset); - ret = kernel_sendpage(sock, bvec->bv_page, - bvec->bv_offset + offset, - len, flags); --- -2.30.0 - diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD index c10c045e4..c694ba880 100644 --- a/core/linux-armv7/PKGBUILD +++ b/core/linux-armv7/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-armv7 _srcname=linux-5.10 _kernelname=${pkgbase#linux} _desc="ARMv7 multi-platform" -pkgver=5.10.14 +pkgver=5.10.16 pkgrel=1 -rcnver=5.10.8 -rcnrel=armv7-x20 +rcnver=5.10.14 +rcnrel=armv7-x23 arch=('armv7h') url="http://www.kernel.org/" license=('GPL2') @@ -28,7 +28,6 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" '0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch' '0008-ARM-dove-enable-ethernet-on-D3Plug.patch' '0009-USB-Armory-MkII-support.patch' - '0010-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch' 'config' 'kernel.its' 'kernel.keyblock' @@ -37,18 +36,17 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" '60-linux.hook' '90-linux.hook') md5sums=('753adc474bf799d569dec4f165ed92c3' - 'd928049c6149ed507afbb72c90cb2dc2' - '1d57de70e483defb128592d86073153f' - 'e2981280bf9cbaba21f9d4ed0d097216' - '0029b87e303c57a92262b1e3b5950bc0' - '6ae17755c0240fd0a8fcd51dec18b441' - '228eaad2fe43ff44a26b4520f5588357' - '048e3b317b6c8d11af9204719abe9def' - 'e7b91008b5a797848d5fef8e26be63f4' - '4d33accb3c07ecab87a3e40de233d2e9' - '9c1635f7d38f468b29c3df606800d716' - '2e98803f460936e8abc38ad97054e312' - '8cb99f1f47234e5438fb5fc7fa772618' + '6eb3cfa9872f7c0cbc59e5c17eca854c' + 'c9d64648e8b4b99f8858842763e92926' + 'ffc91ed3449fcd94963026a721af4bde' + '9bdef005a6a4f17fe35f0bb84452716a' + '202b232cc15c26e210343f4ae4939549' + 'e4176a23a18f4890bc3401f985906875' + '097e3111be9cd590a7862e4b72a76091' + '9651ebaef98eec15a6e8cda74f6667ae' + '2672cd801ae6561f290fa0346f45619f' + 'efb105180114a22bfdcd69f66f1b8ad0' + 'de59321c56388d6580defc32c22187f6' 'f3d97cf32174dc0da2bd5830883a809b' '4f2379ed84258050edb858ee8d281678' '61c5ff73c136ed07a7aadbf58db3d96a' @@ -76,7 +74,6 @@ prepare() { git apply ../0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch git apply ../0008-ARM-dove-enable-ethernet-on-D3Plug.patch git apply ../0009-USB-Armory-MkII-support.patch - git apply ../0010-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch cat "${srcdir}/config" > ./.config