kernel: bump 4.14 to 4.14.128
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
		| @@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold <johan@kernel.org> | ||||
|  | ||||
| --- a/drivers/usb/serial/option.c | ||||
| +++ b/drivers/usb/serial/option.c | ||||
| @@ -1941,7 +1941,8 @@ static const struct usb_device_id option | ||||
| @@ -1947,7 +1947,8 @@ static const struct usb_device_id option | ||||
|  	{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) },			/* D-Link DWM-156 (variant) */ | ||||
|  	{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) }, | ||||
|  	{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) }, | ||||
|   | ||||
| @@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|  	depends on BROKEN || !FRV | ||||
| --- a/kernel/Makefile | ||||
| +++ b/kernel/Makefile | ||||
| @@ -112,6 +112,7 @@ obj-$(CONFIG_CONTEXT_TRACKING) += contex | ||||
| @@ -113,6 +113,7 @@ obj-$(CONFIG_CONTEXT_TRACKING) += contex | ||||
|  obj-$(CONFIG_TORTURE_TEST) += torture.o | ||||
|   | ||||
|  obj-$(CONFIG_HAS_IOMEM) += memremap.o | ||||
|   | ||||
| @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> | ||||
|  /** | ||||
|   *	ata_build_rw_tf - Build ATA taskfile for given read/write request | ||||
|   *	@tf: Target ATA taskfile | ||||
| @@ -5121,6 +5134,9 @@ struct ata_queued_cmd *ata_qc_new_init(s | ||||
| @@ -5124,6 +5137,9 @@ struct ata_queued_cmd *ata_qc_new_init(s | ||||
|  		if (tag < 0) | ||||
|  			return NULL; | ||||
|  	} | ||||
| @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> | ||||
|   | ||||
|  	qc = __ata_qc_from_tag(ap, tag); | ||||
|  	qc->tag = tag; | ||||
| @@ -6022,6 +6038,9 @@ struct ata_port *ata_port_alloc(struct a | ||||
| @@ -6025,6 +6041,9 @@ struct ata_port *ata_port_alloc(struct a | ||||
|  	ap->stats.unhandled_irq = 1; | ||||
|  	ap->stats.idle_irq = 1; | ||||
|  #endif | ||||
| @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> | ||||
|  	ata_sff_port_init(ap); | ||||
|   | ||||
|  	return ap; | ||||
| @@ -6043,6 +6062,12 @@ static void ata_host_release(struct devi | ||||
| @@ -6046,6 +6065,12 @@ static void ata_host_release(struct devi | ||||
|   | ||||
|  		kfree(ap->pmp_link); | ||||
|  		kfree(ap->slave_link); | ||||
| @@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> | ||||
|  		kfree(ap); | ||||
|  		host->ports[i] = NULL; | ||||
|  	} | ||||
| @@ -6489,7 +6514,23 @@ int ata_host_register(struct ata_host *h | ||||
| @@ -6492,7 +6517,23 @@ int ata_host_register(struct ata_host *h | ||||
|  		host->ports[i]->print_id = atomic_inc_return(&ata_print_id); | ||||
|  		host->ports[i]->local_port_no = i + 1; | ||||
|  	} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Koen Vandeputte
					Koen Vandeputte