aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-03 13:41:17 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-03 17:01:20 +0200
commit1867f108075a875c3334d827beff74bc6c24f2f6 (patch)
treef62a741c27fae576c172c64774871e515d654cba /target
parent7fe1b4a4b2c93de98acc7e613273883ecd7b14bf (diff)
downloadupstream-1867f108075a875c3334d827beff74bc6c24f2f6.tar.gz
upstream-1867f108075a875c3334d827beff74bc6c24f2f6.tar.bz2
upstream-1867f108075a875c3334d827beff74bc6c24f2f6.zip
kernel: bump 4.14 to 4.14.123
Refreshed all patches. Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target')
-rw-r--r--target/linux/cns3xxx/patches-4.14/075-spi_support.patch2
-rw-r--r--target/linux/generic/hack-4.14/911-kobject_add_broadcast_uevent.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch
index e38dbdb75e..401ec876e9 100644
--- a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch
+++ b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch
@@ -39,7 +39,7 @@
/**
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
-@@ -1027,6 +1027,9 @@ static int spi_transfer_one_message(stru
+@@ -1029,6 +1029,9 @@ static int spi_transfer_one_message(stru
list_for_each_entry(xfer, &msg->transfers, transfer_list) {
trace_spi_transfer_start(msg, xfer);
diff --git a/target/linux/generic/hack-4.14/911-kobject_add_broadcast_uevent.patch b/target/linux/generic/hack-4.14/911-kobject_add_broadcast_uevent.patch
index 19400af189..bf46428854 100644
--- a/target/linux/generic/hack-4.14/911-kobject_add_broadcast_uevent.patch
+++ b/target/linux/generic/hack-4.14/911-kobject_add_broadcast_uevent.patch
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif /* _KOBJECT_H_ */
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
-@@ -599,6 +599,43 @@ int add_uevent_var(struct kobj_uevent_en
+@@ -602,6 +602,43 @@ int add_uevent_var(struct kobj_uevent_en
EXPORT_SYMBOL_GPL(add_uevent_var);
#if defined(CONFIG_NET)