kernel: bump 4.9 to 4.9.117
Refreshed all patches Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
parent
4bb8a678e0
commit
4ec4dd2a11
10 changed files with 14 additions and 14 deletions
|
@ -4,13 +4,13 @@ LINUX_RELEASE?=1
|
||||||
|
|
||||||
LINUX_VERSION-3.18 = .71
|
LINUX_VERSION-3.18 = .71
|
||||||
LINUX_VERSION-4.4 = .121
|
LINUX_VERSION-4.4 = .121
|
||||||
LINUX_VERSION-4.9 = .116
|
|
||||||
LINUX_VERSION-4.14 = .59
|
LINUX_VERSION-4.14 = .59
|
||||||
|
LINUX_VERSION-4.9 = .117
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
|
LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
|
||||||
LINUX_KERNEL_HASH-4.4.121 = 44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729
|
LINUX_KERNEL_HASH-4.4.121 = 44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729
|
||||||
LINUX_KERNEL_HASH-4.9.116 = 999e8291bec0bcef2e0b91b6d58d8be5eb5e7c70881df59439364b22b693ff1d
|
|
||||||
LINUX_KERNEL_HASH-4.14.59 = 7ec633c661bba941239e340bb35391d356eda541fb4c323d07034d09d05b319b
|
LINUX_KERNEL_HASH-4.14.59 = 7ec633c661bba941239e340bb35391d356eda541fb4c323d07034d09d05b319b
|
||||||
|
LINUX_KERNEL_HASH-4.9.117 = 8232ea326ac5784d71baa09c0cd7806a2674f8449c0be73e2ae341e6880279b0
|
||||||
|
|
||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
||||||
|
|
|
@ -696,7 +696,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
|
||||||
}
|
}
|
||||||
--- a/drivers/usb/core/hub.c
|
--- a/drivers/usb/core/hub.c
|
||||||
+++ b/drivers/usb/core/hub.c
|
+++ b/drivers/usb/core/hub.c
|
||||||
@@ -5068,7 +5068,7 @@ static void port_event(struct usb_hub *h
|
@@ -5072,7 +5072,7 @@ static void port_event(struct usb_hub *h
|
||||||
if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
|
if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
|
||||||
u16 status = 0, unused;
|
u16 status = 0, unused;
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
||||||
|
|
||||||
--- a/drivers/usb/dwc2/hcd.c
|
--- a/drivers/usb/dwc2/hcd.c
|
||||||
+++ b/drivers/usb/dwc2/hcd.c
|
+++ b/drivers/usb/dwc2/hcd.c
|
||||||
@@ -4381,6 +4381,9 @@ static int _dwc2_hcd_suspend(struct usb_
|
@@ -4383,6 +4383,9 @@ static int _dwc2_hcd_suspend(struct usb_
|
||||||
if (!HCD_HW_ACCESSIBLE(hcd))
|
if (!HCD_HW_ACCESSIBLE(hcd))
|
||||||
goto unlock;
|
goto unlock;
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
||||||
|
|
||||||
--- a/drivers/usb/dwc2/hcd.c
|
--- a/drivers/usb/dwc2/hcd.c
|
||||||
+++ b/drivers/usb/dwc2/hcd.c
|
+++ b/drivers/usb/dwc2/hcd.c
|
||||||
@@ -5200,7 +5200,6 @@ error3:
|
@@ -5202,7 +5202,6 @@ error3:
|
||||||
error2:
|
error2:
|
||||||
usb_put_hcd(hcd);
|
usb_put_hcd(hcd);
|
||||||
error1:
|
error1:
|
||||||
|
|
|
@ -33,7 +33,7 @@ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
||||||
|
|
||||||
--- a/fs/ext4/ialloc.c
|
--- a/fs/ext4/ialloc.c
|
||||||
+++ b/fs/ext4/ialloc.c
|
+++ b/fs/ext4/ialloc.c
|
||||||
@@ -1313,7 +1313,10 @@ int ext4_init_inode_table(struct super_b
|
@@ -1316,7 +1316,10 @@ int ext4_init_inode_table(struct super_b
|
||||||
ext4_itable_unused_count(sb, gdp)),
|
ext4_itable_unused_count(sb, gdp)),
|
||||||
sbi->s_inodes_per_block);
|
sbi->s_inodes_per_block);
|
||||||
|
|
||||||
|
|
|
@ -232,7 +232,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
--- a/mm/vmalloc.c
|
--- a/mm/vmalloc.c
|
||||||
+++ b/mm/vmalloc.c
|
+++ b/mm/vmalloc.c
|
||||||
@@ -2713,6 +2713,8 @@ static const struct file_operations proc
|
@@ -2714,6 +2714,8 @@ static const struct file_operations proc
|
||||||
|
|
||||||
static int __init proc_vmalloc_init(void)
|
static int __init proc_vmalloc_init(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
--- a/include/linux/serial_core.h
|
--- a/include/linux/serial_core.h
|
||||||
+++ b/include/linux/serial_core.h
|
+++ b/include/linux/serial_core.h
|
||||||
@@ -455,7 +455,7 @@ extern void uart_handle_cts_change(struc
|
@@ -456,7 +456,7 @@ extern void uart_handle_cts_change(struc
|
||||||
extern void uart_insert_char(struct uart_port *port, unsigned int status,
|
extern void uart_insert_char(struct uart_port *port, unsigned int status,
|
||||||
unsigned int overrun, unsigned int ch, unsigned int flag);
|
unsigned int overrun, unsigned int ch, unsigned int flag);
|
||||||
|
|
||||||
|
|
|
@ -358,7 +358,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||||
help
|
help
|
||||||
--- a/drivers/mtd/nand/fsl_ifc_nand.c
|
--- a/drivers/mtd/nand/fsl_ifc_nand.c
|
||||||
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
|
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
|
||||||
@@ -898,7 +898,7 @@ static int fsl_ifc_chip_init(struct fsl_
|
@@ -901,7 +901,7 @@ static int fsl_ifc_chip_init(struct fsl_
|
||||||
chip->ecc.algo = NAND_ECC_HAMMING;
|
chip->ecc.algo = NAND_ECC_HAMMING;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1472,7 +1472,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||||
}
|
}
|
||||||
--- a/include/linux/dma-iommu.h
|
--- a/include/linux/dma-iommu.h
|
||||||
+++ b/include/linux/dma-iommu.h
|
+++ b/include/linux/dma-iommu.h
|
||||||
@@ -27,6 +27,7 @@ int iommu_dma_init(void);
|
@@ -28,6 +28,7 @@ int iommu_dma_init(void);
|
||||||
|
|
||||||
/* Domain management interface for IOMMU drivers */
|
/* Domain management interface for IOMMU drivers */
|
||||||
int iommu_get_dma_cookie(struct iommu_domain *domain);
|
int iommu_get_dma_cookie(struct iommu_domain *domain);
|
||||||
|
@ -1480,7 +1480,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||||
void iommu_put_dma_cookie(struct iommu_domain *domain);
|
void iommu_put_dma_cookie(struct iommu_domain *domain);
|
||||||
|
|
||||||
/* Setup call for arch DMA mapping code */
|
/* Setup call for arch DMA mapping code */
|
||||||
@@ -66,6 +67,7 @@ int iommu_dma_mapping_error(struct devic
|
@@ -67,6 +68,7 @@ int iommu_dma_mapping_error(struct devic
|
||||||
|
|
||||||
/* The DMA API isn't _quite_ the whole story, though... */
|
/* The DMA API isn't _quite_ the whole story, though... */
|
||||||
void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg);
|
void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg);
|
||||||
|
@ -1488,7 +1488,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
@@ -82,6 +84,11 @@ static inline int iommu_get_dma_cookie(s
|
@@ -83,6 +85,11 @@ static inline int iommu_get_dma_cookie(s
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1500,7 +1500,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||||
static inline void iommu_put_dma_cookie(struct iommu_domain *domain)
|
static inline void iommu_put_dma_cookie(struct iommu_domain *domain)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -90,6 +97,10 @@ static inline void iommu_dma_map_msi_msg
|
@@ -91,6 +98,10 @@ static inline void iommu_dma_map_msi_msg
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -156,7 +156,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||||
int ret;
|
int ret;
|
||||||
--- a/drivers/usb/core/hub.c
|
--- a/drivers/usb/core/hub.c
|
||||||
+++ b/drivers/usb/core/hub.c
|
+++ b/drivers/usb/core/hub.c
|
||||||
@@ -4427,6 +4427,14 @@ hub_port_init(struct usb_hub *hub, struc
|
@@ -4431,6 +4431,14 @@ hub_port_init(struct usb_hub *hub, struc
|
||||||
else
|
else
|
||||||
speed = usb_speed_string(udev->speed);
|
speed = usb_speed_string(udev->speed);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue