From e8c405b2048410f4c0fbc5e8a793bc6706e0e40e Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Wed, 13 Jul 2016 10:15:04 +0200 Subject: kernel: bump 4.1 to 4.1.27 Signed-off-by: Zoltan HERPAI --- .../492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch | 2 +- .../linux/generic/patches-4.1/494-mtd-ubi-add-EOF-marker-support.patch | 2 +- .../linux/generic/patches-4.1/811-pci_disable_usb_common_quirks.patch | 2 +- .../linux/generic/patches-4.1/820-usb_add_usb_find_device_by_name.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/generic/patches-4.1') diff --git a/target/linux/generic/patches-4.1/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/patches-4.1/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch index f6c71a2f63..c4a672c964 100644 --- a/target/linux/generic/patches-4.1/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch +++ b/target/linux/generic/patches-4.1/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch @@ -41,7 +41,7 @@ Signed-off-by: Daniel Golle #ifdef CONFIG_ROOT_NFS #define NFSROOT_TIMEOUT_MIN 5 -@@ -532,6 +552,10 @@ void __init mount_root(void) +@@ -532,6 +553,10 @@ void __init mount_root(void) change_floppy("root floppy"); } #endif diff --git a/target/linux/generic/patches-4.1/494-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/patches-4.1/494-mtd-ubi-add-EOF-marker-support.patch index 14fae764fe..dd5ee306ef 100644 --- a/target/linux/generic/patches-4.1/494-mtd-ubi-add-EOF-marker-support.patch +++ b/target/linux/generic/patches-4.1/494-mtd-ubi-add-EOF-marker-support.patch @@ -41,7 +41,7 @@ break; --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h -@@ -739,6 +739,7 @@ struct ubi_attach_info { +@@ -741,6 +741,7 @@ struct ubi_attach_info { int mean_ec; uint64_t ec_sum; int ec_count; diff --git a/target/linux/generic/patches-4.1/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-4.1/811-pci_disable_usb_common_quirks.patch index 6de4f6b9c7..e078b4e8aa 100644 --- a/target/linux/generic/patches-4.1/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-4.1/811-pci_disable_usb_common_quirks.patch @@ -84,7 +84,7 @@ #endif /* __LINUX_USB_PCI_QUIRKS_H */ --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h -@@ -447,7 +447,14 @@ extern int usb_hcd_pci_probe(struct pci_ +@@ -448,7 +448,14 @@ extern int usb_hcd_pci_probe(struct pci_ extern void usb_hcd_pci_remove(struct pci_dev *dev); extern void usb_hcd_pci_shutdown(struct pci_dev *dev); diff --git a/target/linux/generic/patches-4.1/820-usb_add_usb_find_device_by_name.patch b/target/linux/generic/patches-4.1/820-usb_add_usb_find_device_by_name.patch index 906f0e215e..6a16c5e7b4 100644 --- a/target/linux/generic/patches-4.1/820-usb_add_usb_find_device_by_name.patch +++ b/target/linux/generic/patches-4.1/820-usb_add_usb_find_device_by_name.patch @@ -74,7 +74,7 @@ * @dev: device the buffer will be used with --- a/include/linux/usb.h +++ b/include/linux/usb.h -@@ -721,6 +721,7 @@ static inline bool usb_device_no_sg_cons +@@ -720,6 +720,7 @@ static inline bool usb_device_no_sg_cons return udev && udev->bus && udev->bus->no_sg_constraint; } -- cgit v1.2.3