diff options
| author | John Audia <graysky@archlinux.us> | 2021-06-23 03:00:02 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-26 12:49:15 +0200 |
| commit | d8dc9f108a9267a1783269d59e8afcf2ebe7e6db (patch) | |
| tree | 4a287e6ce97ae551ca41ef8aeed80afcf4df353c /target/linux/generic | |
| parent | 697e80d12b776f424448bded5e4ed3a06517ddfc (diff) | |
| download | upstream-d8dc9f108a9267a1783269d59e8afcf2ebe7e6db.tar.gz upstream-d8dc9f108a9267a1783269d59e8afcf2ebe7e6db.tar.bz2 upstream-d8dc9f108a9267a1783269d59e8afcf2ebe7e6db.zip | |
kernel: bump 5.4 to 5.4.126
Manually rebased:
bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
All other patches automatically rebased.
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/config-5.4 | 1 | ||||
| -rw-r--r-- | target/linux/generic/hack-5.4/221-module_exports.patch | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4 index f5e976a691..fe5204abb5 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -3833,6 +3833,7 @@ CONFIG_NMI_LOG_BUF_SHIFT=13 # CONFIG_NVMEM_SYSFS is not set # CONFIG_NVME_FC is not set # CONFIG_NVME_TARGET is not set +# CONFIG_NVME_TCP is not set # CONFIG_NVRAM is not set # CONFIG_NV_TCO is not set # CONFIG_NXP_STB220 is not set diff --git a/target/linux/generic/hack-5.4/221-module_exports.patch b/target/linux/generic/hack-5.4/221-module_exports.patch index 09855b04d1..ef6e980892 100644 --- a/target/linux/generic/hack-5.4/221-module_exports.patch +++ b/target/linux/generic/hack-5.4/221-module_exports.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } \ \ /* __*init sections */ \ -@@ -903,6 +913,8 @@ +@@ -904,6 +914,8 @@ EXIT_TEXT \ EXIT_DATA \ EXIT_CALL \ |