aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2016-09-15 15:27:45 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2016-10-24 20:25:14 +0300
commit2fc3680dd066419576cb0129d0c1bd7618b90f1a (patch)
treef5956c394aedc3bb3a6a5f45e1d1ddc658d3dc58 /target/linux/oxnas
parent06405df7a8da24b7d735b32454c7d3b1f2ebaabc (diff)
downloadupstream-2fc3680dd066419576cb0129d0c1bd7618b90f1a.tar.gz
upstream-2fc3680dd066419576cb0129d0c1bd7618b90f1a.tar.bz2
upstream-2fc3680dd066419576cb0129d0c1bd7618b90f1a.zip
kernel: update kernel 4.1 to version 4.1.34
Refresh patches for all targets supporting 4.1 and not marked broken. Compile-tested on all targets using 4.1 and not marked broken. Changes to generic/610-netfilter_match_bypass_default_checks.patch based on 84d489f64f3b382d5544e342f66d8806e94e85d3. Changes to generic/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch based on a90ee92337d60fd14b6431adcda9929b955f3408. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/oxnas')
-rw-r--r--target/linux/oxnas/patches-4.1/320-oxnas-irqchip.patch2
-rw-r--r--target/linux/oxnas/patches-4.1/800-oxnas-ehci.patch2
-rw-r--r--target/linux/oxnas/patches-4.1/996-ATAG_DTB_COMPAT_CMDLINE_MANGLE.patch4
-rw-r--r--target/linux/oxnas/patches-4.1/999-libata-hacks.patch4
4 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/oxnas/patches-4.1/320-oxnas-irqchip.patch b/target/linux/oxnas/patches-4.1/320-oxnas-irqchip.patch
index d0833eaaf0..5a2447d5cb 100644
--- a/target/linux/oxnas/patches-4.1/320-oxnas-irqchip.patch
+++ b/target/linux/oxnas/patches-4.1/320-oxnas-irqchip.patch
@@ -24,7 +24,7 @@
obj-$(CONFIG_ARCH_VT8500) += irq-vt8500.o
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
-@@ -1036,6 +1036,7 @@ IRQCHIP_DECLARE(arm1176jzf_dc_gic, "arm,
+@@ -1044,6 +1044,7 @@ IRQCHIP_DECLARE(arm1176jzf_dc_gic, "arm,
IRQCHIP_DECLARE(cortex_a15_gic, "arm,cortex-a15-gic", gic_of_init);
IRQCHIP_DECLARE(cortex_a9_gic, "arm,cortex-a9-gic", gic_of_init);
IRQCHIP_DECLARE(cortex_a7_gic, "arm,cortex-a7-gic", gic_of_init);
diff --git a/target/linux/oxnas/patches-4.1/800-oxnas-ehci.patch b/target/linux/oxnas/patches-4.1/800-oxnas-ehci.patch
index b283bbd3f6..87377e7cad 100644
--- a/target/linux/oxnas/patches-4.1/800-oxnas-ehci.patch
+++ b/target/linux/oxnas/patches-4.1/800-oxnas-ehci.patch
@@ -16,7 +16,7 @@
config USB_OXU210HP_HCD
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
-@@ -42,6 +42,7 @@ obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-
+@@ -39,6 +39,7 @@ obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-
obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o
obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o
obj-$(CONFIG_USB_W90X900_EHCI) += ehci-w90x900.o
diff --git a/target/linux/oxnas/patches-4.1/996-ATAG_DTB_COMPAT_CMDLINE_MANGLE.patch b/target/linux/oxnas/patches-4.1/996-ATAG_DTB_COMPAT_CMDLINE_MANGLE.patch
index be15ec4772..297fc7fbbd 100644
--- a/target/linux/oxnas/patches-4.1/996-ATAG_DTB_COMPAT_CMDLINE_MANGLE.patch
+++ b/target/linux/oxnas/patches-4.1/996-ATAG_DTB_COMPAT_CMDLINE_MANGLE.patch
@@ -18,7 +18,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -1928,6 +1928,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1894,6 +1894,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property.
@@ -164,7 +164,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
static int kernel_init(void *);
extern void init_IRQ(void);
-@@ -560,6 +564,18 @@ asmlinkage __visible void __init start_k
+@@ -555,6 +559,18 @@ asmlinkage __visible void __init start_k
page_alloc_init();
pr_notice("Kernel command line: %s\n", boot_command_line);
diff --git a/target/linux/oxnas/patches-4.1/999-libata-hacks.patch b/target/linux/oxnas/patches-4.1/999-libata-hacks.patch
index 7d6670be56..f4574da9ba 100644
--- a/target/linux/oxnas/patches-4.1/999-libata-hacks.patch
+++ b/target/linux/oxnas/patches-4.1/999-libata-hacks.patch
@@ -15,7 +15,7 @@
/* initialize internal qc */
/* XXX: Tag 0 is used for drivers with legacy EH as some
-@@ -4780,6 +4788,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4786,6 +4794,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
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);
-@@ -4825,6 +4836,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -4831,6 +4842,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);