From d3c6606980982d35b844b07a393729b1eeef9474 Mon Sep 17 00:00:00 2001 From: luka Date: Sat, 3 Jan 2015 22:59:47 +0000 Subject: [PATCH 1/1] kernel: update 3.18 to 3.18.1 Signed-off-by: Luka Perkov git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43821 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- .../405-mtd-old-firmware-uimage-splitter.patch | 4 ++-- .../406-mtd-old-rootfs-squashfs-splitter.patch | 2 +- ...part-support-TRX-data-partition-being-UBI.patch | 2 +- .../502-yaffs-3.10-disable-proc-entry.patch | 2 +- .../645-bridge_multicast_to_unicast.patch | 12 +++++------ .../generic/patches-3.18/834-ledtrig-libata.patch | 25 +++++++--------------- 7 files changed, 21 insertions(+), 30 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index d4edf9f1eb..1c80a8f68f 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,14 +7,14 @@ LINUX_VERSION-3.8 = .13 LINUX_VERSION-3.10 = .58 LINUX_VERSION-3.13 = .7 LINUX_VERSION-3.14 = .27 -LINUX_VERSION-3.18 = +LINUX_VERSION-3.18 = .1 LINUX_KERNEL_MD5SUM-3.3.8 = f1058f64eed085deb44f10cee8541d50 LINUX_KERNEL_MD5SUM-3.8.13 = 2af19d06cd47ec459519159cdd10542d LINUX_KERNEL_MD5SUM-3.10.58 = 3ff3478b6351143cef22d4b81cf48b01 LINUX_KERNEL_MD5SUM-3.13.7 = 370adced5e5c1cb1d0d621c2dae2723f LINUX_KERNEL_MD5SUM-3.14.27 = 0af2d0702df6ee6d7181e697e0af3481 -LINUX_KERNEL_MD5SUM-3.18 = 9e854df51ca3fef8bfe566dbd7b89241 +LINUX_KERNEL_MD5SUM-3.18.1 = 79c9b73a01e1dce0a4c28828496ef02c ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/target/linux/generic/patches-3.18/405-mtd-old-firmware-uimage-splitter.patch b/target/linux/generic/patches-3.18/405-mtd-old-firmware-uimage-splitter.patch index a19202a870..df1d726e86 100644 --- a/target/linux/generic/patches-3.18/405-mtd-old-firmware-uimage-splitter.patch +++ b/target/linux/generic/patches-3.18/405-mtd-old-firmware-uimage-splitter.patch @@ -14,7 +14,7 @@ endmenu --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -681,6 +681,37 @@ mtd_pad_erasesize(struct mtd_info *mtd, +@@ -681,6 +681,37 @@ mtd_pad_erasesize(struct mtd_info *mtd, return len; } @@ -52,7 +52,7 @@ #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME #else -@@ -689,7 +720,14 @@ mtd_pad_erasesize(struct mtd_info *mtd, +@@ -689,7 +720,14 @@ mtd_pad_erasesize(struct mtd_info *mtd, static void split_firmware(struct mtd_info *master, struct mtd_part *part) { diff --git a/target/linux/generic/patches-3.18/406-mtd-old-rootfs-squashfs-splitter.patch b/target/linux/generic/patches-3.18/406-mtd-old-rootfs-squashfs-splitter.patch index d48a681483..ca81958432 100644 --- a/target/linux/generic/patches-3.18/406-mtd-old-rootfs-squashfs-splitter.patch +++ b/target/linux/generic/patches-3.18/406-mtd-old-rootfs-squashfs-splitter.patch @@ -14,7 +14,7 @@ default y --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -681,6 +681,47 @@ mtd_pad_erasesize(struct mtd_info *mtd, +@@ -681,6 +681,47 @@ mtd_pad_erasesize(struct mtd_info *mtd, return len; } diff --git a/target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch b/target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch index 46881fca2c..4c4720341e 100644 --- a/target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch +++ b/target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch @@ -17,7 +17,7 @@ u64 offset, uint32_t mask_flags) { part->name = name; -@@ -58,6 +59,26 @@ static void bcm47xxpart_add_part(struct +@@ -58,6 +59,26 @@ static void bcm47xxpart_add_part(struct part->mask_flags = mask_flags; } diff --git a/target/linux/generic/patches-3.18/502-yaffs-3.10-disable-proc-entry.patch b/target/linux/generic/patches-3.18/502-yaffs-3.10-disable-proc-entry.patch index 5345678c56..5b73d3898b 100644 --- a/target/linux/generic/patches-3.18/502-yaffs-3.10-disable-proc-entry.patch +++ b/target/linux/generic/patches-3.18/502-yaffs-3.10-disable-proc-entry.patch @@ -8,7 +8,7 @@ static struct proc_dir_entry *my_proc_entry; static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev) -@@ -3398,6 +3399,7 @@ static int yaffs_proc_write(struct file +@@ -3398,6 +3399,7 @@ static int yaffs_proc_write(struct file return yaffs_proc_debug_write(file, buf, count, data); return yaffs_proc_write_trace_options(file, buf, count, data); } diff --git a/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch b/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch index d870dc5d5f..5acfea6c3a 100644 --- a/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch +++ b/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch @@ -198,7 +198,7 @@ } #endif -@@ -1556,6 +1584,7 @@ static int br_multicast_ipv4_rcv(struct +@@ -1556,6 +1584,7 @@ static int br_multicast_ipv4_rcv(struct struct sk_buff *skb, u16 vid) { @@ -206,7 +206,7 @@ struct sk_buff *skb2 = skb; const struct iphdr *iph; struct igmphdr *ih; -@@ -1629,7 +1658,7 @@ static int br_multicast_ipv4_rcv(struct +@@ -1629,7 +1658,7 @@ static int br_multicast_ipv4_rcv(struct case IGMP_HOST_MEMBERSHIP_REPORT: case IGMPV2_HOST_MEMBERSHIP_REPORT: BR_INPUT_SKB_CB(skb)->mrouters_only = 1; @@ -215,7 +215,7 @@ break; case IGMPV3_HOST_MEMBERSHIP_REPORT: err = br_ip4_multicast_igmp3_report(br, port, skb2, vid); -@@ -1638,7 +1667,7 @@ static int br_multicast_ipv4_rcv(struct +@@ -1638,7 +1667,7 @@ static int br_multicast_ipv4_rcv(struct err = br_ip4_multicast_query(br, port, skb2, vid); break; case IGMP_HOST_LEAVE_MESSAGE: @@ -224,7 +224,7 @@ break; } -@@ -1656,6 +1685,7 @@ static int br_multicast_ipv6_rcv(struct +@@ -1656,6 +1685,7 @@ static int br_multicast_ipv6_rcv(struct struct sk_buff *skb, u16 vid) { @@ -232,7 +232,7 @@ struct sk_buff *skb2; const struct ipv6hdr *ip6h; u8 icmp6_type; -@@ -1765,7 +1795,8 @@ static int br_multicast_ipv6_rcv(struct +@@ -1765,7 +1795,8 @@ static int br_multicast_ipv6_rcv(struct } mld = (struct mld_msg *)skb_transport_header(skb2); BR_INPUT_SKB_CB(skb)->mrouters_only = 1; @@ -242,7 +242,7 @@ break; } case ICMPV6_MLD2_REPORT: -@@ -1782,7 +1813,7 @@ static int br_multicast_ipv6_rcv(struct +@@ -1782,7 +1813,7 @@ static int br_multicast_ipv6_rcv(struct goto out; } mld = (struct mld_msg *)skb_transport_header(skb2); diff --git a/target/linux/generic/patches-3.18/834-ledtrig-libata.patch b/target/linux/generic/patches-3.18/834-ledtrig-libata.patch index ec61ed9e31..cfe92d9a02 100644 --- a/target/linux/generic/patches-3.18/834-ledtrig-libata.patch +++ b/target/linux/generic/patches-3.18/834-ledtrig-libata.patch @@ -22,8 +22,6 @@ Signed-off-by: Daniel Golle include/linux/libata.h | 9 +++++++++ 3 files changed, 66 insertions(+) -diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig -index cd4cccb..7a085ec 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -46,6 +46,22 @@ config ATA_VERBOSE_ERROR @@ -49,11 +47,9 @@ index cd4cccb..7a085ec 100644 config ATA_ACPI bool "ATA ACPI Support" depends on ACPI && PCI -diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c -index 5c84fb5..eb49e02 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c -@@ -725,6 +725,19 @@ u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev) +@@ -725,6 +725,19 @@ u64 ata_tf_read_block(struct ata_taskfil return block; } @@ -73,7 +69,7 @@ index 5c84fb5..eb49e02 100644 /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @tf: Target ATA taskfile -@@ -4761,6 +4774,9 @@ static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap) +@@ -4753,6 +4766,9 @@ static struct ata_queued_cmd *ata_qc_new break; } } @@ -83,7 +79,7 @@ index 5c84fb5..eb49e02 100644 return qc; } -@@ -5671,6 +5687,9 @@ struct ata_port *ata_port_alloc(struct ata_host *host) +@@ -5663,6 +5679,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -93,7 +89,7 @@ index 5c84fb5..eb49e02 100644 ata_sff_port_init(ap); return ap; -@@ -5692,6 +5711,12 @@ static void ata_host_release(struct device *gendev, void *res) +@@ -5684,6 +5703,12 @@ static void ata_host_release(struct devi kfree(ap->pmp_link); kfree(ap->slave_link); @@ -106,7 +102,7 @@ index 5c84fb5..eb49e02 100644 kfree(ap); host->ports[i] = NULL; } -@@ -6138,7 +6163,23 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) +@@ -6130,7 +6155,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; } @@ -114,11 +110,11 @@ index 5c84fb5..eb49e02 100644 + for (i = 0; i < host->n_ports; i++) { + if (unlikely(!host->ports[i]->ledtrig)) + continue; -+ + + snprintf(host->ports[i]->ledtrig_name, + sizeof(host->ports[i]->ledtrig_name), "ata%u", + host->ports[i]->print_id); - ++ + host->ports[i]->ledtrig->name = host->ports[i]->ledtrig_name; + + if (led_trigger_register(host->ports[i]->ledtrig)) { @@ -130,8 +126,6 @@ index 5c84fb5..eb49e02 100644 /* Create associated sysfs transport objects */ for (i = 0; i < host->n_ports; i++) { rc = ata_tport_add(host->dev,host->ports[i]); -diff --git a/include/linux/libata.h b/include/linux/libata.h -index 2d18241..4428e2b 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -38,6 +38,9 @@ @@ -144,7 +138,7 @@ index 2d18241..4428e2b 100644 /* * Define if arch has non-standard setup. This is a _PCI_ standard -@@ -862,6 +865,12 @@ struct ata_port { +@@ -861,6 +864,12 @@ struct ata_port { #ifdef CONFIG_ATA_ACPI struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */ #endif @@ -157,6 +151,3 @@ index 2d18241..4428e2b 100644 /* owned by EH */ u8 sector_buf[ATA_SECT_SIZE] ____cacheline_aligned; }; --- -2.1.3 - -- 2.11.0