diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-18 10:04:35 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-22 21:15:17 +0200 |
| commit | 6e243c23530189f0ef252c921aa953d05f048c4d (patch) | |
| tree | 8753a4d0ad5df41cf08e7b8b77a2d611bebabd6f | |
| parent | ff9ac986cebe6f405d1d3a992c36c8224f128fef (diff) | |
| download | upstream-6e243c23530189f0ef252c921aa953d05f048c4d.tar.gz upstream-6e243c23530189f0ef252c921aa953d05f048c4d.tar.bz2 upstream-6e243c23530189f0ef252c921aa953d05f048c4d.zip | |
kernel: bump 4.9 to 4.9.169
Refreshed all patches.
New symbols:
- CONFIG_LDISC_AUTOLOAD
- CONFIG_PPC_BARRIER_NOSPEC
Compile-tested on: ar7
Runtime-tested on: none
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
| -rw-r--r-- | include/kernel-version.mk | 4 | ||||
| -rw-r--r-- | target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch | 2 | ||||
| -rw-r--r-- | target/linux/generic/config-4.9 | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 8f80c31977..72bd2ede1b 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,12 +3,12 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .136 -LINUX_VERSION-4.9 = .168 +LINUX_VERSION-4.9 = .169 LINUX_VERSION-4.14 = .111 LINUX_VERSION-4.19 = .34 LINUX_KERNEL_HASH-3.18.136 = 48c8775013d23229462134f911bbb14c7935096fcccfb19ce28ecd5f7154f35c -LINUX_KERNEL_HASH-4.9.168 = 4d451c21effad77de323edc9bfeae095aa1faed1a801ef427d66f5763bef091e +LINUX_KERNEL_HASH-4.9.169 = b776636c63a555961cfe9f6f4a315e65ab0ff3376acdb3cf5ad654808ff8d6b0 LINUX_KERNEL_HASH-4.14.111 = f8197d56553f864d1d2e97abbe4fca50f8ab5e72089c292d22f0e4395340a6e8 LINUX_KERNEL_HASH-4.19.34 = dd795e2a1fddbee5b03c3bb55a1926829cc08df4fdcabce62dda717ba087b8cc 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 578cbd9bc6..9a21132033 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 @@ -399,7 +399,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /* bnx2x_has_rx_work() reads the status block, --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c -@@ -1787,7 +1787,7 @@ static int bnxt_poll_nitroa0(struct napi +@@ -1797,7 +1797,7 @@ static int bnxt_poll_nitroa0(struct napi } if (!bnxt_has_work(bp, cpr) && rx_pkts < budget) { diff --git a/target/linux/generic/config-4.9 b/target/linux/generic/config-4.9 index 644c1d359c..1ed16edf02 100644 --- a/target/linux/generic/config-4.9 +++ b/target/linux/generic/config-4.9 @@ -2138,6 +2138,7 @@ CONFIG_LBDAF=y # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_PARTITION is not set CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y # CONFIG_LEDS_BCM6328 is not set @@ -3329,6 +3330,7 @@ CONFIG_PINMUX=y # CONFIG_PPC_256K_PAGES is not set CONFIG_PPC_4K_PAGES=y # CONFIG_PPC_64K_PAGES is not set +CONFIG_PPC_BARRIER_NOSPEC=y # CONFIG_PPC_DISABLE_WERROR is not set # CONFIG_PPC_EMULATED_STATS is not set # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set |