From f053a8ce415da2e276dfd54288a02a98a819d09e Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 13 May 2019 10:54:43 +0200 Subject: [PATCH] kernel: bump 4.9 to 4.9.175 Refreshed all patches. Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- .../patches-4.9/310-lib-add-rle-decompression.patch | 2 +- .../patches-4.9/950-0031-Add-dwc_otg-driver.patch | 2 +- .../pending-4.9/530-jffs2_make_lzma_available.patch | 4 ++-- .../generic/pending-4.9/630-packet_socket_type.patch | 6 +++--- .../patches-4.9/0030-GPIO-add-named-gpio-exports.patch | 2 +- .../patches-4.9/817-usb-support-layerscape.patch | 2 +- .../patches-4.9/818-vfio-support-layerscape.patch | 8 ++++---- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 311a9b5e86..70ae299abf 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,10 +2,10 @@ LINUX_RELEASE?=1 -LINUX_VERSION-4.9 = .172 +LINUX_VERSION-4.9 = .175 LINUX_VERSION-4.14 = .115 -LINUX_KERNEL_HASH-4.9.172 = 49428e30989cc0b069a6f4b7bc08988deb02d10f910ca0c4d1e44b22155eb40e +LINUX_KERNEL_HASH-4.9.175 = d98434f91f9df2bf36c7896ca747b7cf98be2e3a491073fd26e3f53cda07500c LINUX_KERNEL_HASH-4.14.115 = b7ae61711a1323053d68fd47911b92977afd526d302755518e42744251516186 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/ar71xx/patches-4.9/310-lib-add-rle-decompression.patch b/target/linux/ar71xx/patches-4.9/310-lib-add-rle-decompression.patch index d8480125a9..e64b89adcd 100644 --- a/target/linux/ar71xx/patches-4.9/310-lib-add-rle-decompression.patch +++ b/target/linux/ar71xx/patches-4.9/310-lib-add-rle-decompression.patch @@ -12,7 +12,7 @@ # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.) --- a/lib/Makefile +++ b/lib/Makefile -@@ -120,6 +120,7 @@ obj-$(CONFIG_XZ_DEC) += xz/ +@@ -121,6 +121,7 @@ obj-$(CONFIG_XZ_DEC) += xz/ obj-$(CONFIG_RAID6_PQ) += raid6/ obj-$(CONFIG_LZMA_COMPRESS) += lzma/ obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/ diff --git a/target/linux/brcm2708/patches-4.9/950-0031-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.9/950-0031-Add-dwc_otg-driver.patch index 9a490f5bb6..fddcb3e4c6 100644 --- a/target/linux/brcm2708/patches-4.9/950-0031-Add-dwc_otg-driver.patch +++ b/target/linux/brcm2708/patches-4.9/950-0031-Add-dwc_otg-driver.patch @@ -707,7 +707,7 @@ Signed-off-by: Noralf Trønnes msleep(100); /* Cool down */ --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c -@@ -1922,6 +1922,85 @@ free_interfaces: +@@ -1924,6 +1924,85 @@ free_interfaces: if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) cp->string = usb_cache_string(dev, cp->desc.iConfiguration); diff --git a/target/linux/generic/pending-4.9/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-4.9/530-jffs2_make_lzma_available.patch index 8c8a025f78..31e7f2a259 100644 --- a/target/linux/generic/pending-4.9/530-jffs2_make_lzma_available.patch +++ b/target/linux/generic/pending-4.9/530-jffs2_make_lzma_available.patch @@ -244,7 +244,7 @@ Signed-off-by: Alexandros C. Couloumbis +} --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c -@@ -371,14 +371,41 @@ static int __init init_jffs2_fs(void) +@@ -374,14 +374,41 @@ static int __init init_jffs2_fs(void) BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68); BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32); @@ -1119,7 +1119,7 @@ Signed-off-by: Alexandros C. Couloumbis ifdef CONFIG_FUNCTION_TRACER ORIG_CFLAGS := $(KBUILD_CFLAGS) KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS)) -@@ -108,6 +118,8 @@ obj-$(CONFIG_LZ4HC_COMPRESS) += lz4/ +@@ -109,6 +119,8 @@ obj-$(CONFIG_LZ4HC_COMPRESS) += lz4/ obj-$(CONFIG_LZ4_DECOMPRESS) += lz4/ obj-$(CONFIG_XZ_DEC) += xz/ obj-$(CONFIG_RAID6_PQ) += raid6/ diff --git a/target/linux/generic/pending-4.9/630-packet_socket_type.patch b/target/linux/generic/pending-4.9/630-packet_socket_type.patch index 13a544736d..018d006929 100644 --- a/target/linux/generic/pending-4.9/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.9/630-packet_socket_type.patch @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3266,6 +3268,7 @@ static int packet_create(struct net *net +@@ -3270,6 +3272,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3879,6 +3882,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3883,6 +3886,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -3931,6 +3944,13 @@ static int packet_getsockopt(struct sock +@@ -3935,6 +3948,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/lantiq/patches-4.9/0030-GPIO-add-named-gpio-exports.patch b/target/linux/lantiq/patches-4.9/0030-GPIO-add-named-gpio-exports.patch index e205ed057d..eb05632eb5 100644 --- a/target/linux/lantiq/patches-4.9/0030-GPIO-add-named-gpio-exports.patch +++ b/target/linux/lantiq/patches-4.9/0030-GPIO-add-named-gpio-exports.patch @@ -22,7 +22,7 @@ Signed-off-by: John Crispin #include "gpiolib.h" -@@ -539,3 +541,73 @@ void of_gpiochip_remove(struct gpio_chip +@@ -545,3 +547,73 @@ void of_gpiochip_remove(struct gpio_chip gpiochip_remove_pin_ranges(chip); of_node_put(chip->of_node); } diff --git a/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch index 310104de7c..953f02de6c 100644 --- a/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch @@ -1710,7 +1710,7 @@ Signed-off-by: Yangbo Lu #define BCSR5_INT_USB (0x02) --- a/include/linux/usb.h +++ b/include/linux/usb.h -@@ -362,6 +362,7 @@ struct usb_bus { +@@ -360,6 +360,7 @@ struct usb_bus { * for control transfers? */ u8 otg_port; /* 0, or number of OTG/HNP port */ diff --git a/target/linux/layerscape/patches-4.9/818-vfio-support-layerscape.patch b/target/linux/layerscape/patches-4.9/818-vfio-support-layerscape.patch index 05806a98d0..84eda53467 100644 --- a/target/linux/layerscape/patches-4.9/818-vfio-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/818-vfio-support-layerscape.patch @@ -1086,7 +1086,7 @@ Signed-off-by: Yangbo Lu #define DRIVER_VERSION "0.2" #define DRIVER_AUTHOR "Alex Williamson " -@@ -720,6 +722,27 @@ static void vfio_test_domain_fgsp(struct +@@ -733,6 +735,27 @@ static void vfio_test_domain_fgsp(struct __free_pages(pages, order); } @@ -1114,7 +1114,7 @@ Signed-off-by: Yangbo Lu static int vfio_iommu_type1_attach_group(void *iommu_data, struct iommu_group *iommu_group) { -@@ -728,6 +751,8 @@ static int vfio_iommu_type1_attach_group +@@ -741,6 +764,8 @@ static int vfio_iommu_type1_attach_group struct vfio_domain *domain, *d; struct bus_type *bus = NULL; int ret; @@ -1123,7 +1123,7 @@ Signed-off-by: Yangbo Lu mutex_lock(&iommu->lock); -@@ -774,11 +799,15 @@ static int vfio_iommu_type1_attach_group +@@ -787,11 +812,15 @@ static int vfio_iommu_type1_attach_group if (ret) goto out_domain; @@ -1141,7 +1141,7 @@ Signed-off-by: Yangbo Lu pr_warn("%s: No interrupt remapping support. Use the module param \"allow_unsafe_interrupts\" to enable VFIO IOMMU support on this platform\n", __func__); ret = -EPERM; -@@ -820,6 +849,12 @@ static int vfio_iommu_type1_attach_group +@@ -833,6 +862,12 @@ static int vfio_iommu_type1_attach_group if (ret) goto out_detach; -- 2.30.2