diff options
author | Magnus Kroken <mkroken@gmail.com> | 2018-03-03 01:12:07 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-03 12:58:55 +0100 |
commit | 5af85dab22a2ae78194d54d30c33fc2c1fb0f4e5 (patch) | |
tree | 66905f7c20499cbef087e0a3ce39676883381650 /target/linux/generic/backport-4.9 | |
parent | 45ae5c2de3491ed5db9695d21faebf95b3b41c56 (diff) | |
download | upstream-5af85dab22a2ae78194d54d30c33fc2c1fb0f4e5.tar.gz upstream-5af85dab22a2ae78194d54d30c33fc2c1fb0f4e5.tar.bz2 upstream-5af85dab22a2ae78194d54d30c33fc2c1fb0f4e5.zip |
kernel: bump 4.9 to 4.9.85
Signed-off-by: Magnus Kroken <mkroken@gmail.com>
Diffstat (limited to 'target/linux/generic/backport-4.9')
-rw-r--r-- | target/linux/generic/backport-4.9/011-kbuild-export-SUBARCH.patch | 2 | ||||
-rw-r--r-- | target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-4.9/011-kbuild-export-SUBARCH.patch b/target/linux/generic/backport-4.9/011-kbuild-export-SUBARCH.patch index a191f9b2c6..d937c83f33 100644 --- a/target/linux/generic/backport-4.9/011-kbuild-export-SUBARCH.patch +++ b/target/linux/generic/backport-4.9/011-kbuild-export-SUBARCH.patch @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/Makefile +++ b/Makefile -@@ -409,8 +409,8 @@ KERNELRELEASE = $(shell cat include/conf +@@ -411,8 +411,8 @@ KERNELRELEASE = $(shell cat include/conf KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index d68670e219..4fe42a9c07 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -637,7 +637,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> return received; --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c -@@ -3186,7 +3186,7 @@ static int gfar_poll_rx_sq(struct napi_s +@@ -3193,7 +3193,7 @@ static int gfar_poll_rx_sq(struct napi_s if (work_done < budget) { u32 imask; @@ -646,7 +646,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /* Clear the halt bit in RSTAT */ gfar_write(®s->rstat, gfargrp->rstat); -@@ -3275,7 +3275,7 @@ static int gfar_poll_rx(struct napi_stru +@@ -3282,7 +3282,7 @@ static int gfar_poll_rx(struct napi_stru if (!num_act_queues) { u32 imask; |