Author: kaloz Date: 2015-04-07 23:34:38 +0200 (Tue, 07 Apr 2015) New Revision: 45305
Modified: trunk/include/kernel-version.mk trunk/target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch trunk/target/linux/generic/patches-4.0/834-ledtrig-libata.patch trunk/target/linux/generic/patches-4.0/863-gpiommc.patch trunk/target/linux/generic/patches-4.0/902-debloat_proc.patch trunk/target/linux/generic/patches-4.0/903-debloat_direct_io.patch Log: generic/4.0: upgrade to 4.0-rc7 Signed-off-by: Imre Kaloz <[email protected]> Modified: trunk/include/kernel-version.mk =================================================================== --- trunk/include/kernel-version.mk 2015-04-07 21:31:36 UTC (rev 45304) +++ trunk/include/kernel-version.mk 2015-04-07 21:34:38 UTC (rev 45305) @@ -7,14 +7,14 @@ LINUX_VERSION-3.13 = .7 LINUX_VERSION-3.14 = .35 LINUX_VERSION-3.18 = .11 -LINUX_VERSION-4.0 = -rc6 +LINUX_VERSION-4.0 = -rc7 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.35 = e5e92c40d14bc8ae9a8701db4e1cbb27 LINUX_KERNEL_MD5SUM-3.18.11 = 2def91951c9cedf7896efb864e0c090c -LINUX_KERNEL_MD5SUM-4.0-rc6 = bec0aeeacab2852d9a17ccbfa7e280f8 +LINUX_KERNEL_MD5SUM-4.0-rc7 = 26db663899b1a54397b4f184ca05f213 ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) Modified: trunk/target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch =================================================================== --- trunk/target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch 2015-04-07 21:31:36 UTC (rev 45304) +++ trunk/target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch 2015-04-07 21:34:38 UTC (rev 45305) @@ -17,7 +17,7 @@ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4005,6 +4005,9 @@ static enum gro_result dev_gro_receive(s +@@ -4007,6 +4007,9 @@ static enum gro_result dev_gro_receive(s enum gro_result ret; int grow; @@ -27,7 +27,7 @@ if (!(skb->dev->features & NETIF_F_GRO)) goto normal; -@@ -5152,6 +5155,48 @@ static void __netdev_adjacent_dev_unlink +@@ -5154,6 +5157,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -76,7 +76,7 @@ static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *private) -@@ -5212,6 +5257,7 @@ static int __netdev_upper_dev_link(struc +@@ -5214,6 +5259,7 @@ static int __netdev_upper_dev_link(struc goto rollback_lower_mesh; } @@ -84,7 +84,7 @@ call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev); return 0; -@@ -5329,6 +5375,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -5331,6 +5377,7 @@ void netdev_upper_dev_unlink(struct net_ list_for_each_entry(i, &upper_dev->all_adj_list.upper, list) __netdev_adjacent_dev_unlink(dev, i->dev); @@ -92,7 +92,7 @@ call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev); } EXPORT_SYMBOL(netdev_upper_dev_unlink); -@@ -5868,6 +5915,7 @@ int dev_set_mac_address(struct net_devic +@@ -5870,6 +5917,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; Modified: trunk/target/linux/generic/patches-4.0/834-ledtrig-libata.patch =================================================================== --- trunk/target/linux/generic/patches-4.0/834-ledtrig-libata.patch 2015-04-07 21:31:36 UTC (rev 45304) +++ trunk/target/linux/generic/patches-4.0/834-ledtrig-libata.patch 2015-04-07 21:34:38 UTC (rev 45305) @@ -69,7 +69,7 @@ /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @tf: Target ATA taskfile -@@ -4742,6 +4755,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4753,6 +4766,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (tag < 0) return NULL; } @@ -79,7 +79,7 @@ qc = __ata_qc_from_tag(ap, tag); qc->tag = tag; -@@ -5636,6 +5652,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -5647,6 +5663,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -89,7 +89,7 @@ ata_sff_port_init(ap); return ap; -@@ -5657,6 +5676,12 @@ static void ata_host_release(struct devi +@@ -5668,6 +5687,12 @@ static void ata_host_release(struct devi kfree(ap->pmp_link); kfree(ap->slave_link); @@ -102,7 +102,7 @@ kfree(ap); host->ports[i] = NULL; } -@@ -6103,7 +6128,23 @@ int ata_host_register(struct ata_host *h +@@ -6114,7 +6139,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; } Modified: trunk/target/linux/generic/patches-4.0/863-gpiommc.patch =================================================================== --- trunk/target/linux/generic/patches-4.0/863-gpiommc.patch 2015-04-07 21:31:36 UTC (rev 45304) +++ trunk/target/linux/generic/patches-4.0/863-gpiommc.patch 2015-04-07 21:34:38 UTC (rev 45305) @@ -830,7 +830,7 @@ +be done automatically. --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -4482,6 +4482,11 @@ T: git git://linuxtv.org/anttip/media_tr +@@ -4481,6 +4481,11 @@ T: git git://linuxtv.org/anttip/media_tr S: Maintained F: drivers/media/usb/hackrf/ Modified: trunk/target/linux/generic/patches-4.0/902-debloat_proc.patch =================================================================== --- trunk/target/linux/generic/patches-4.0/902-debloat_proc.patch 2015-04-07 21:31:36 UTC (rev 45304) +++ trunk/target/linux/generic/patches-4.0/902-debloat_proc.patch 2015-04-07 21:34:38 UTC (rev 45305) @@ -1,6 +1,6 @@ --- a/fs/locks.c +++ b/fs/locks.c -@@ -2641,6 +2641,8 @@ static const struct file_operations proc +@@ -2640,6 +2640,8 @@ static const struct file_operations proc static int __init proc_locks_init(void) { @@ -173,7 +173,7 @@ goto err; --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -2956,6 +2956,8 @@ static __net_initdata struct pernet_oper +@@ -2975,6 +2975,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { Modified: trunk/target/linux/generic/patches-4.0/903-debloat_direct_io.patch =================================================================== --- trunk/target/linux/generic/patches-4.0/903-debloat_direct_io.patch 2015-04-07 21:31:36 UTC (rev 45304) +++ trunk/target/linux/generic/patches-4.0/903-debloat_direct_io.patch 2015-04-07 21:34:38 UTC (rev 45305) @@ -26,7 +26,7 @@ endif --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -2614,12 +2614,25 @@ enum { +@@ -2615,12 +2615,25 @@ enum { DIO_ASYNC_EXTEND = 0x04, }; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
