aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-04-07 21:34:38 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-04-07 21:34:38 +0000
commit0d7d44e1c14da6001a358d3c1777d82d42fb12f4 (patch)
treef3753cac1e3fa34d450ce24b3029ec0db914a74c /target/linux/generic
parent046a1b56406df961c37fe3e6a30ee57060363aa1 (diff)
downloadupstream-0d7d44e1c14da6001a358d3c1777d82d42fb12f4.tar.gz
upstream-0d7d44e1c14da6001a358d3c1777d82d42fb12f4.tar.bz2
upstream-0d7d44e1c14da6001a358d3c1777d82d42fb12f4.zip
generic/4.0: upgrade to 4.0-rc7
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45305 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch10
-rw-r--r--target/linux/generic/patches-4.0/834-ledtrig-libata.patch8
-rw-r--r--target/linux/generic/patches-4.0/863-gpiommc.patch2
-rw-r--r--target/linux/generic/patches-4.0/902-debloat_proc.patch4
-rw-r--r--target/linux/generic/patches-4.0/903-debloat_direct_io.patch2
5 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 48d73d1301..f0d5b4715e 100644
--- a/target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/patches-4.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- 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 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
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 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
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 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
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 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
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;
diff --git a/target/linux/generic/patches-4.0/834-ledtrig-libata.patch b/target/linux/generic/patches-4.0/834-ledtrig-libata.patch
index b59483ec25..a3a606275e 100644
--- a/target/linux/generic/patches-4.0/834-ledtrig-libata.patch
+++ b/target/linux/generic/patches-4.0/834-ledtrig-libata.patch
@@ -69,7 +69,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
-@@ -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 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
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 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
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 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
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;
}
diff --git a/target/linux/generic/patches-4.0/863-gpiommc.patch b/target/linux/generic/patches-4.0/863-gpiommc.patch
index b46f876678..3433e20019 100644
--- a/target/linux/generic/patches-4.0/863-gpiommc.patch
+++ b/target/linux/generic/patches-4.0/863-gpiommc.patch
@@ -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/
diff --git a/target/linux/generic/patches-4.0/902-debloat_proc.patch b/target/linux/generic/patches-4.0/902-debloat_proc.patch
index 26a217553b..ca9fd91efc 100644
--- a/target/linux/generic/patches-4.0/902-debloat_proc.patch
+++ b/target/linux/generic/patches-4.0/902-debloat_proc.patch
@@ -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)
{
diff --git a/target/linux/generic/patches-4.0/903-debloat_direct_io.patch b/target/linux/generic/patches-4.0/903-debloat_direct_io.patch
index cb32df2094..1b5453bc2b 100644
--- a/target/linux/generic/patches-4.0/903-debloat_direct_io.patch
+++ b/target/linux/generic/patches-4.0/903-debloat_direct_io.patch
@@ -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,
};