projects
/
openwrt
/
staging
/
981213.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2999c34
)
kernel: bump 4.14 to 4.14.128
author
Koen Vandeputte
<koen.vandeputte@ncentric.com>
Wed, 19 Jun 2019 13:42:13 +0000
(15:42 +0200)
committer
Koen Vandeputte
<koen.vandeputte@ncentric.com>
Thu, 20 Jun 2019 13:51:03 +0000
(15:51 +0200)
Refreshed all patches.
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
include/kernel-version.mk
patch
|
blob
|
history
target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
patch
|
blob
|
history
target/linux/generic/hack-4.14/930-crashlog.patch
patch
|
blob
|
history
target/linux/generic/pending-4.14/834-ledtrig-libata.patch
patch
|
blob
|
history
target/linux/oxnas/patches-4.14/999-libata-hacks.patch
patch
|
blob
|
history
target/linux/ramips/patches-4.14/0032-USB-dwc2-add-device_reset.patch
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index 774e02f34df9d75a9ff1cbe59030fe943956b5c5..55fae9e66972e393d7703294d71792f3c30c7987 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-3,10
+3,10
@@
LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .182
LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .182
-LINUX_VERSION-4.14 = .12
7
+LINUX_VERSION-4.14 = .12
8
LINUX_KERNEL_HASH-4.9.182 = b16e12681a0638368479d73a9b1b8e9407c1ae4b7ae52fdf236d9e5657999695
LINUX_KERNEL_HASH-4.9.182 = b16e12681a0638368479d73a9b1b8e9407c1ae4b7ae52fdf236d9e5657999695
-LINUX_KERNEL_HASH-4.14.12
7 = d7464c2379cdee46548ae9f848671f4669d4003af4034f3f738f2f0511ec75b
3
+LINUX_KERNEL_HASH-4.14.12
8 = e93c2c754f1f9c610314b2fe9f27a9636ad3a7f43983469bb8e0f44a531f291
3
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git
a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
index 7053f61a0c269276a6ca735cb1def01382245f10..b60e9d32306ee93a04adb70d1f777b8379b8459d 100644
(file)
--- a/
target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
+++ b/
target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
@@
-30,7
+30,7
@@
Signed-off-by: Johan Hovold <johan@kernel.org>
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
-@@ -194
1,7 +1941
,8 @@ static const struct usb_device_id option
+@@ -194
7,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) },
{ 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) },
diff --git
a/target/linux/generic/hack-4.14/930-crashlog.patch
b/target/linux/generic/hack-4.14/930-crashlog.patch
index 17ba187925553146f4b277c3d5c44e5a48678dc0..1479a4c06d0b9755901fb4b412636e8a07543834 100644
(file)
--- a/
target/linux/generic/hack-4.14/930-crashlog.patch
+++ b/
target/linux/generic/hack-4.14/930-crashlog.patch
@@
-54,7
+54,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
depends on BROKEN || !FRV
--- a/kernel/Makefile
+++ b/kernel/Makefile
depends on BROKEN || !FRV
--- a/kernel/Makefile
+++ b/kernel/Makefile
-@@ -11
2,6 +112
,7 @@ obj-$(CONFIG_CONTEXT_TRACKING) += contex
+@@ -11
3,6 +113
,7 @@ obj-$(CONFIG_CONTEXT_TRACKING) += contex
obj-$(CONFIG_TORTURE_TEST) += torture.o
obj-$(CONFIG_HAS_IOMEM) += memremap.o
obj-$(CONFIG_TORTURE_TEST) += torture.o
obj-$(CONFIG_HAS_IOMEM) += memremap.o
diff --git
a/target/linux/generic/pending-4.14/834-ledtrig-libata.patch
b/target/linux/generic/pending-4.14/834-ledtrig-libata.patch
index 392d41c94f291bab510f6469fbae64c5814b51dd..f59085b51cd70523c3574fc3c248dbad17dbd9dc 100644
(file)
--- a/
target/linux/generic/pending-4.14/834-ledtrig-libata.patch
+++ b/
target/linux/generic/pending-4.14/834-ledtrig-libata.patch
@@
-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
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
-@@ -512
1,6 +5134
,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -512
4,6 +5137
,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
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;
qc = __ata_qc_from_tag(ap, tag);
qc->tag = tag;
-@@ -602
2,6 +6038
,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -602
5,6 +6041
,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
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;
ata_sff_port_init(ap);
return ap;
-@@ -604
3,6 +6062
,12 @@ static void ata_host_release(struct devi
+@@ -604
6,6 +6065
,12 @@ static void ata_host_release(struct devi
kfree(ap->pmp_link);
kfree(ap->slave_link);
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;
}
kfree(ap);
host->ports[i] = NULL;
}
-@@ -64
89,7 +6514
,23 @@ int ata_host_register(struct ata_host *h
+@@ -64
92,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;
}
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}
diff --git
a/target/linux/oxnas/patches-4.14/999-libata-hacks.patch
b/target/linux/oxnas/patches-4.14/999-libata-hacks.patch
index 382a16329aae3dff1e16b91abaef6ad5751708f4..29132befb500ccb096532179f0670f989ee97d12 100644
(file)
--- a/
target/linux/oxnas/patches-4.14/999-libata-hacks.patch
+++ b/
target/linux/oxnas/patches-4.14/999-libata-hacks.patch
@@
-15,7
+15,7
@@
/* initialize internal qc */
/* XXX: Tag 0 is used for drivers with legacy EH as some
/* initialize internal qc */
/* XXX: Tag 0 is used for drivers with legacy EH as some
-@@ -51
28,6 +5136
,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -51
31,6 +5139
,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
return NULL;
if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
return NULL;
@@
-25,7
+25,7
@@
/* libsas case */
if (ap->flags & ATA_FLAG_SAS_HOST) {
tag = ata_sas_allocate_tag(ap);
/* libsas case */
if (ap->flags & ATA_FLAG_SAS_HOST) {
tag = ata_sas_allocate_tag(ap);
-@@ -517
3,6 +5184
,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -517
6,6 +5187
,8 @@ void ata_qc_free(struct ata_queued_cmd *
qc->tag = ATA_TAG_POISON;
if (ap->flags & ATA_FLAG_SAS_HOST)
ata_sas_free_tag(tag, ap);
qc->tag = ATA_TAG_POISON;
if (ap->flags & ATA_FLAG_SAS_HOST)
ata_sas_free_tag(tag, ap);
diff --git
a/target/linux/ramips/patches-4.14/0032-USB-dwc2-add-device_reset.patch
b/target/linux/ramips/patches-4.14/0032-USB-dwc2-add-device_reset.patch
index d9449eb39f8c2b317f4642e5f207af3c76970750..8ff9c0f754a01cf8bfa2785bd7e851006dbac4d4 100644
(file)
--- a/
target/linux/ramips/patches-4.14/0032-USB-dwc2-add-device_reset.patch
+++ b/
target/linux/ramips/patches-4.14/0032-USB-dwc2-add-device_reset.patch
@@
-18,7
+18,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
#include <linux/usb/hcd.h>
#include <linux/usb/ch11.h>
#include <linux/usb/hcd.h>
#include <linux/usb/ch11.h>
-@@ -51
71,6 +5172
,8 @@ int dwc2_hcd_init(struct dwc2_hsotg *hso
+@@ -51
80,6 +5181
,8 @@ int dwc2_hcd_init(struct dwc2_hsotg *hso
retval = -ENOMEM;
retval = -ENOMEM;