Commit Graph

15715 Commits

Author SHA1 Message Date
Maximilian Bosch a6800d5c8e
Merge pull request #136235 from NixOS/backport-136150-to-release-21.05
[Backport release-21.05] linux_latest: 5.13.13 -> 5.14
2021-09-04 13:42:13 +02:00
Josef Kemetmüller bebbeb1918 bluez: Disable kernel dependent test-mesh-crypto
I'm having trouble building bluez on a CentOS 7.9 builder.
Turns out that the test-mesh-crypto test depends on the following Linux
kernel configuration items:
CONFIG_CRYPTO_[USER|USER_API|USER_API_AEAD|USER_API_HASH|AES|CCM|AEAD|CMAC]
and will fail if run wih an incompatible kernel with the following error
message:

    ...
    IVindex              = 12345678
    NetworkNonce         = 00800000011201000012345678
                           00800000011201000012345678 => PASS
    PrivacyRandom        = 000000000012345678b5e5bfdacbaf6c
                           000000000012345678fffd034b50057e => FAIL
    FAIL unit/test-mesh-crypto (exit status: 1)

I found the same bug reported on Gentoo https://bugs.gentoo.org/704190.
Their fix is to only run the test if the kernel options are available,
which we don't want to do for build reproducibility.
Instead we just want to skip the test unconditionally. As it's simpler
to completely override the test instead of patching the build system, we
opt for doing just that.

(cherry picked from commit 05c517698dcf6a989e364863cf5e7f6f548dd50a)
2021-09-02 18:02:37 +00:00
Alyssa Ross 4cc8956845 linux_latest-libre: 18260 -> 18268
(cherry picked from commit e6f7a48269fd807a1cc65335aad6f5ce2ba367d8)
2021-08-30 20:28:52 +00:00
Alyssa Ross e16cacff39 linux_latest: 5.13.13 -> 5.14
(cherry picked from commit 5d1c50837be54312b71ac83ddc1d1b6629d09073)
2021-08-30 20:28:51 +00:00
Julian Stecklina 52269b659e linuxPackages.tuxedo-keyboard: expose all kernel modules
This commit exposes in addition to the tuxedo-keyboard module:

- clevo_acpi
- clevo_wmi
- tuxedo_io

These modules are required to run the Tuxedo Control Center.

(cherry picked from commit 2e6d563067c620d42c9d63911a637793698273eb)
2021-08-30 00:58:37 +02:00
Julian Stecklina e17d7f323b linuxPackages.tuxedo-keyboard: 3.0.7 -> 3.0.8
(cherry picked from commit f7286acdae6382fc868c7764943ac9b1c4799090)
2021-08-30 00:58:35 +02:00
fortuneteller2k 84b9c18a47 linuxPackages.tuxedo-keyboard: 3.0.5 -> 3.0.7
(cherry picked from commit c7ec86b6894f7c216f4a381ebade4d717069a955)
2021-08-30 00:58:22 +02:00
Jörg Thalheim 5faf4632f7
Merge pull request #136017 from Atemu/backport/update/linux_zen
[Backport release-21.05] linux_zen
2021-08-29 08:30:14 +01:00
Jörg Thalheim 846fa972d5 linux_zen: 5.13.12-zen1 -> 5.13.13-zen1
(cherry picked from commit 093349c14ef3b8985154d878d793a3b7a7292eff)
2021-08-28 09:13:04 +02:00
Jörg Thalheim c07d3055ca linux_zen: 5.13.10-zen1 -> 5.13.12-zen1
(cherry picked from commit 5e6958fa75696085384f60f7d10f9b4c03822565)
2021-08-28 09:12:42 +02:00
TredwellGit e5b4b37c5a linux/hardened/patches/5.4: 5.4.142-hardened1 -> 5.4.143-hardened1
(cherry picked from commit e2fbc79e446ce1695b09da9521e339d6e3e2a5d0)
2021-08-27 16:28:40 +00:00
TredwellGit 53a6232591 linux/hardened/patches/5.13: init at 5.13.13-hardened1
(cherry picked from commit b9f854004e76fd448ca8f41e444593038eaefdff)
2021-08-27 16:28:40 +00:00
TredwellGit e22a87d1d2 linux/hardened/patches/5.10: 5.10.60-hardened1 -> 5.10.61-hardened1
(cherry picked from commit efcb008ba44845e3aec2a3d2d44e53f2ea4dac26)
2021-08-27 16:28:39 +00:00
TredwellGit 5aeb5af282 linux/hardened/patches/4.19: 4.19.204-hardened1 -> 4.19.205-hardened1
(cherry picked from commit 885a18686b2ba40d527b27c12a2e72d3b1ecda19)
2021-08-27 16:28:39 +00:00
TredwellGit 1d1f808935 linux/hardened/patches/4.14: 4.14.244-hardened1 -> 4.14.245-hardened1
(cherry picked from commit d002bb6e6f35cbb4de3df5e41d53906c5d983e2f)
2021-08-27 16:28:38 +00:00
TredwellGit ac519a8f84 linux_latest-libre: 18239 -> 18260
(cherry picked from commit 5b94350a90c86c69d2d8e2bea14dc490d3b219e8)
2021-08-27 16:28:37 +00:00
TredwellGit b137e4f19f linux-rt_5_10: 5.10.56-rt49 -> 5.10.59-rt52
(cherry picked from commit 0adbd0852faa0baf26e4be9e1a23e9819431fcf9)
2021-08-27 16:28:37 +00:00
TredwellGit ceb5fc136c linux: 5.4.142 -> 5.4.143
(cherry picked from commit 48183dde30f12435bc59f92d9de3ca0cbcfddb7c)
2021-08-27 16:28:36 +00:00
TredwellGit 9dfb717fb9 linux: 5.13.12 -> 5.13.13
(cherry picked from commit ca0b7b4e189583f44b0e53eb029dab45e45f03c6)
2021-08-27 16:28:35 +00:00
TredwellGit d3dd950f8c linux: 5.10.60 -> 5.10.61
(cherry picked from commit 78eea2b5d20e33616492242ba82966f9b2609036)
2021-08-27 16:28:35 +00:00
TredwellGit f77576ec34 linux: 4.9.280 -> 4.9.281
(cherry picked from commit 4442d7b8ddd5c826baad3c541d16a317be447e54)
2021-08-27 16:28:34 +00:00
TredwellGit 9f131e8464 linux: 4.4.281 -> 4.4.282
(cherry picked from commit 083c38da7abd7956a3ed47df3b0b2da75d124c0f)
2021-08-27 16:28:34 +00:00
TredwellGit c180aa5608 linux: 4.19.204 -> 4.19.205
(cherry picked from commit 88be0cc40c26eb5152443d0d3f542a1c5aea8954)
2021-08-27 16:28:33 +00:00
TredwellGit c498bc0180 linux: 4.14.244 -> 4.14.245
(cherry picked from commit 637878c8af79298ad8e3d905d95907488f7f1696)
2021-08-27 16:28:32 +00:00
Julian Stecklina 4462377467 acpi_call: 1.2.1 -> 1.2.2
(cherry picked from commit 016e8cf78c8009f65d81fbd6c32b00803f3b1f3c)
2021-08-24 19:37:18 +00:00
Martin Weinelt ae2717f11b
Merge pull request #134072 from risicle/ris-openvswitch-CVE-2021-36980-r21.05
[21.05] openvswitch: add patch for CVE-2021-36980
2021-08-24 19:49:01 +02:00
ajs124 7e07a7e299 linuxPackages_5_4_hardened: 5.4.141 -> 5.4.142
(cherry picked from commit 565973316564594fe9a572a8a4c48567375c2f19)
2021-08-22 09:49:01 +00:00
ajs124 9690490f18 linuxPackages_5_10_hardened: 5.10.59 -> 5.10.60
(cherry picked from commit 883db296a2603d42074db9118323667e335e186e)
2021-08-22 09:49:01 +00:00
ajs124 9bb174c59e linuxPackages_5_4_hardened: 5.4.139 -> 5.4.141
(cherry picked from commit b9b1fc1b383fb583721474498d3360a56f5501d5)
2021-08-22 09:49:00 +00:00
ajs124 329105e4a9 linuxPackages_5_10_hardened: 5.10.57 -> 5.10.59
(cherry picked from commit 580d4b687ffad6101e23466789a2f97935bc5c40)
2021-08-22 09:49:00 +00:00
ajs124 676c5aa6bf linuxPackages_4_19_hardened: 4.19.202 -> 4.19.204
(cherry picked from commit a438b96c9e52113fef9ec1ac3cd694bb97bb3caf)
2021-08-22 09:48:59 +00:00
ajs124 0cdce1e22b linuxPackages_4_14_hardened: 4.14.243 -> 4.14.244
(cherry picked from commit 1120eafa972180641006d425d6e9e9b76aa4ee3f)
2021-08-22 09:48:59 +00:00
ajs124 6c74fc118a linuxPackages_hardened: fix update.py
this is kind of hack, idk how this worked before, tbh

(cherry picked from commit e82f9673c5ec76b71409b3ec7e5c99043df63976)
2021-08-22 09:48:58 +00:00
Jörg Thalheim a0a2f6b6ef linux_zen: add update script
(cherry picked from commit e4db1c88471229f71aa529ff388e490e087f2cfe)
2021-08-21 10:04:20 +00:00
Jörg Thalheim 5264329acd linuxPackages_zen: 5.13.9 -> 5.13.10-zen1
(cherry picked from commit 27edf4ccb48ca48375064d5fc964b8ad9b7c0578)
2021-08-21 10:04:19 +00:00
TredwellGit 68a87a1d8e linux_latest-libre: 18210 -> 18239
(cherry picked from commit 4512ae304413d1fd26f329bd1c8b9dcd208d32b2)
2021-08-20 12:12:15 +00:00
TredwellGit d91ef03f45 linux-rt_5_10: 5.10.56-rt48 -> 5.10.56-rt49
(cherry picked from commit 10472677e1acd74e25b4e582dcbe66b618f9a5b4)
2021-08-20 12:12:15 +00:00
TredwellGit 552f2172c6 linux: 5.4.139 -> 5.4.142
(cherry picked from commit 0055f787369b73a59e99d34ace503bb263c92f98)
2021-08-20 12:12:14 +00:00
TredwellGit 6953c465cc linux: 5.13.11 -> 5.13.12
(cherry picked from commit 7ff40c8d9ec1eeb1d7846aef866d2f162bf375a0)
2021-08-20 12:12:14 +00:00
TredwellGit 0c0320e4b9 linux: 5.10.57 -> 5.10.60
(cherry picked from commit ab311a8b253460aaae8a0096545df80b9b65cafc)
2021-08-20 12:12:13 +00:00
TredwellGit 4f323dd3cb linux: 4.19.202 -> 4.19.204
(cherry picked from commit b7a564432b9b941caf4646ebde1f5c88db4bfc7a)
2021-08-20 12:12:13 +00:00
TredwellGit 637741d8e1 linux: 4.14.243 -> 4.14.244
(cherry picked from commit 2b71c4caac5acec35d51ee5de59b65f9a8e217b2)
2021-08-20 12:12:13 +00:00
Yurii Matsiuk 04bd0636a1 firmwareLinuxNonfree: 2021-07-16 -> 2021-08-18
(cherry picked from commit 3239c7bc8dababb8583b2d1f0eb801d82ff1064e)
2021-08-19 17:37:29 +00:00
Vladimír Čunát 7bbca9877c
Merge #134298: linux_5_12: remove (into release-21.05) 2021-08-18 09:26:59 +02:00
TredwellGit aa1af91878 linux_5_12: remove
https://lwn.net/ml/linux-kernel/1626791065147152@kroah.com/
(cherry picked from commit 957f0485dab604c493d7683b8a57c0679b19e35f)
2021-08-16 09:12:57 +00:00
TredwellGit b77e4da370 linux: 5.13.10 -> 5.13.11
(cherry picked from commit f2e78916b9b72d6e4bb00197f9e79abe1c7b2952)
2021-08-16 09:11:43 +00:00
TredwellGit 52d43e083d linux: 4.9.279 -> 4.9.280
(cherry picked from commit 9e9933a76be27acf86a9a0573f6d5bf794ae5cd8)
2021-08-16 09:11:43 +00:00
TredwellGit 68e1d642c9 linux: 4.4.280 -> 4.4.281
(cherry picked from commit 039764362bd23fee07ddce1a6b284e4348a08f41)
2021-08-16 09:11:42 +00:00
Robert Scott 61a9a2d6d7 openvswitch: add patch for CVE-2021-36980 2021-08-14 22:26:16 +01:00
TredwellGit 1cd2856e04 linux-rt_5_4: 5.4.129-rt61 -> 5.4.138-rt62
(cherry picked from commit 89a50ded986523e04028e8ebc1b12274c52ea96d)
2021-08-12 17:27:20 +00:00
TredwellGit 08b33c754d linux: 5.13.9 -> 5.13.10
(cherry picked from commit ff1408d8b0d0baadb5e61f93904b820d0232bbbb)
2021-08-12 17:27:20 +00:00
TredwellGit ad40c4059c linux: 4.4.279 -> 4.4.280
(cherry picked from commit 20ed07939ee194195f1b5ded634ae0bc7252dbf4)
2021-08-12 17:27:19 +00:00
Artturi e14fad1ad5
Merge pull request #133526 from NixOS/backport-133286-to-release-21.05
[Backport release-21.05] linux_zen: 5.13.7 -> 5.13.9
2021-08-12 04:59:04 +03:00
Roman Volosatovs 9485d3ab3b linux_zen: 5.13.7 -> 5.13.9
(cherry picked from commit a9bf9c44e516f1097cb3d13e62293bf14669560c)
2021-08-11 16:55:23 +00:00
Maxine Aubrey 2f24078a01 fwupd: 1.5.7 -> 1.5.12
- https://github.com/fwupd/fwupd/releases/tag/1.5.8
- https://github.com/fwupd/fwupd/releases/tag/1.5.9
- https://github.com/fwupd/fwupd/releases/tag/1.5.10
- https://github.com/fwupd/fwupd/releases/tag/1.5.11
- https://github.com/fwupd/fwupd/releases/tag/1.5.12

(cherry picked from commit 2f3e3c788e071ec3c8b3b7e743f07b453248803e)
2021-08-11 16:28:42 +00:00
github-actions[bot] 840f8cc3b2
Merge staging-next-21.05 into staging-21.05 2021-08-09 12:03:20 +00:00
TredwellGit 295b867eb7 linux/hardened/patches/5.4: 5.4.134-hardened1 -> 5.4.139-hardened1
(cherry picked from commit cbb5ca89ca473f09d8c1abf274f48b19700de57c)
2021-08-09 02:52:56 +00:00
TredwellGit bb8734ccd6 linux/hardened/patches/5.10: 5.10.52-hardened1 -> 5.10.57-hardened1
(cherry picked from commit 7aae6061b6e9879590e4f4315be2b6bdb3b90c09)
2021-08-09 02:52:55 +00:00
TredwellGit b96d4ac43a linux/hardened/patches/4.19: 4.19.198-hardened1 -> 4.19.202-hardened1
(cherry picked from commit 0a41183454eeed7ce105a08ecd8e2ba438bf858d)
2021-08-09 02:52:55 +00:00
TredwellGit e3c440a92b linux/hardened/patches/4.14: 4.14.240-hardened1 -> 4.14.243-hardened1
(cherry picked from commit b84eecf9fc114625f43f9d6cad035d61ad2c439c)
2021-08-09 02:52:54 +00:00
TredwellGit d6ebcc1109 linux-rt_5_10: 5.10.52-rt47 -> 5.10.56-rt48
(cherry picked from commit 8425e47a7416facee6cb0b8dce122715c152ed5b)
2021-08-09 02:52:54 +00:00
TredwellGit e80cfad9f9 linux: 5.4.134 -> 5.4.139
(cherry picked from commit b570def284bedd5821a5d8faf4fc7110b0c8b809)
2021-08-09 02:52:53 +00:00
TredwellGit 86cdede3f8 linux: 5.13.8 -> 5.13.9
(cherry picked from commit d416101b659c8bd8fd3cb224bce5803a0e70e6e8)
2021-08-09 02:52:53 +00:00
TredwellGit e9d400d134 linux: 5.10.52 -> 5.10.57
(cherry picked from commit cde6046992f56b51de41275340560283c5ae6c7d)
2021-08-09 02:52:52 +00:00
TredwellGit 9f9dc1688f linux: 4.9.278 -> 4.9.279
(cherry picked from commit a5713826c48b70b04b6963cd621f4e64a267fab3)
2021-08-09 02:52:52 +00:00
TredwellGit 59bacd23a6 linux: 4.4.278 -> 4.4.279
(cherry picked from commit 1adb289851291353b4062c7d0fe10598de804668)
2021-08-09 02:52:51 +00:00
TredwellGit 000622e70a linux: 4.19.198 -> 4.19.202
(cherry picked from commit 553c6ef12af489a7bd60d5ca9260246aca20a1fe)
2021-08-09 02:52:51 +00:00
TredwellGit 6f1bdd343d linux: 4.14.240 -> 4.14.243
(cherry picked from commit 26ec7c39bb796dd5122dbe60288f81741e91bd0a)
2021-08-09 02:52:50 +00:00
github-actions[bot] 8c47337f31
Merge staging-next-21.05 into staging-21.05 2021-08-08 06:02:59 +00:00
André Vitor de Lima Matos 6ae8e459f5 nvidia_x11: fix suspend script paths since 470.57.02 (#131838)
nvidia 470.57.02 changed the path of `nvidia-sleep.sh` and systemd
scripts, making `builder.sh` miss them and suspend-to-ram on systems
where `hardware.nvidia.powerManagement.enable = true` is set fail.

(cherry picked from commit 3f4bb8ff5a8da1d5b2407e0d6cfb2acfc5bb7f90)
2021-08-07 22:41:22 -07:00
Herman Fries 253365e354 nvidia_x11: 460.73.01 -> 470.57.02
(cherry picked from commit 03100da5a714a2b6c5210ceb6af092073ba4fce5)

Reason: Fixes driver build failures for the 5.13 kernel
2021-08-07 22:41:22 -07:00
github-actions[bot] eeaf5b3a23
Merge staging-next-21.05 into staging-21.05 2021-08-07 00:03:22 +00:00
Artturi e06ef38b52
Merge pull request #130470 from NixOS/backport-130397-to-release-21.05
[Backport release-21.05] firmwareLinuxNonfree: 2021-05-11 -> 2021-07-16
2021-08-07 01:49:56 +03:00
Artturi 29f76e65d0
Merge pull request #131730 from NixOS/backport-130851-to-staging-21.05
[Backport staging-21.05] kernel: enable MOUSE_PS2_VMMOUSE
2021-08-07 00:06:03 +03:00
Artturi c5111db64f
Merge pull request #125481 from NixOS/backport-124722-to-release-21.05
[Backport release-21.05] nvidia-x11: 465.27 -> 465.31
2021-08-07 00:00:24 +03:00
Artturi e76ea216ce
Merge pull request #125254 from NixOS/backport-125097-to-release-21.05
[Backport release-21.05] usbutils: 012 -> 013
2021-08-06 23:25:24 +03:00
Artturi 0cc1a01d6a
Merge pull request #126960 from NixOS/backport-123720-to-release-21.05
[Backport release-21.05] nixos-rebuild: fix creating ./result symlink for flakes
2021-08-06 16:59:35 +03:00
Maximilian Bosch cdc1d0f436
Merge pull request #132741 from NixOS/backport-132719-to-release-21.05
[Backport release-21.05] Kernels 2021-08-04
2021-08-06 13:36:55 +02:00
Artturi 178da37860
Merge pull request #132668 from Artturin/backport-132599-to-release-21.05
[Backport 21.05] linuxPackages.evdi: unstable-2021-06-11 -> unstable-2021-07-7
2021-08-06 01:38:51 +03:00
TredwellGit ab3104a98d linux: 5.13.7 -> 5.13.8
(cherry picked from commit ba2b85dbbb72f34dcdce87f1a1d8fe376d5a5e2b)
2021-08-05 07:16:13 +00:00
TredwellGit 44afd0cf9a linux: 4.9.277 -> 4.9.278
(cherry picked from commit aea5caaeab20f2991593c4ccde0bf5d540e8394b)
2021-08-05 07:16:13 +00:00
TredwellGit cee88fa02a linux: 4.4.277 -> 4.4.278
(cherry picked from commit 202b9e653658a7b77ebd41c7858cd57b8e8655dc)
2021-08-05 07:16:12 +00:00
Maximilian Bosch 0d70ff95e1
Merge pull request #132630 from NixOS/backport-132471-to-release-21.05
[Backport release-21.05] Kernels 2021-08-02
2021-08-04 22:24:30 +02:00
Artturin 2989536017 linuxPackages.evdi: unstable-2021-06-11 -> unstable-2021-07-7
(cherry picked from commit 335632575cef3182d8beee6d96bf76d4cd059898)
2021-08-04 17:24:51 +03:00
TredwellGit f8aab36f81 linux_latest-libre: 18191 -> 18210
(cherry picked from commit e56d304d73b5415b8b08a91e04dc6807160bc84b)
2021-08-04 07:50:01 +00:00
TredwellGit 31b4f817e8 linux: 5.13.6 -> 5.13.7
(cherry picked from commit b4aa8884d19a3a10a57b836a089d0000188f284c)
2021-08-04 07:50:01 +00:00
TredwellGit 2c47a4e052 linux: 4.9.276 -> 4.9.277
(cherry picked from commit 32c78c9e12cfe3fed66c81ba47d575f365e25fd7)
2021-08-04 07:50:00 +00:00
TredwellGit 8829f5bf2b linux: 4.4.276 -> 4.4.277
(cherry picked from commit 7d0b3f65aa1eb7500e4638ceaa9770e86c07788c)
2021-08-04 07:50:00 +00:00
Anbang Wen b13df33199 nixos/apple-sdk: 11.0 -> 11.1
The previous URL is a dead link. This commit updates it and bump the
SDK version to 11.1.

(cherry picked from commit 2565e3bba62d8d2f57a975c7ecce97d7c557dfa6)
2021-08-03 15:59:45 -07:00
Jörg Thalheim c0e25740a5 linux_zen: actually enable patchset
(cherry picked from commit 604d0dd0d68daf696a9ba5494b63500e9db36874)
2021-08-01 13:32:42 +00:00
Jörg Thalheim cb52ea7042 linux_zen: 5.13.5 -> 5.13.7
(cherry picked from commit 6e9195f6687d05d4225521a34d1702dd9c0a4444)
2021-08-01 13:32:41 +00:00
Ben Wolsieffer cab8dfb6f6 linux/common-config.nix: disable LPAE on armv7l-linux
LPAE was enabled to support native armv7l builders running in QEMU on aarch64,
but this option disables support for processors which don't support LPAE, which
are still relatively common. In particular, Beaglebones use the Cortex-A8, which
doesn't support LPAE.

Also, if you attempt to boot an LPAE kernel on a CPU that doesn't support it,
it fails before even earlycon is initialized. This makes the problem difficult
to debug without enabling CONFIG_DEBUG_LL or using a hardware debugger.

(cherry picked from commit 988c12faed96159fd5902f3bc372739c111206ef)
2021-07-30 19:44:27 +00:00
github-actions[bot] 1785d7020c
Merge release-21.05 into staging-next-21.05 2021-07-29 12:02:32 +00:00
Vladimír Čunát f90d817036
linuxPackages_latest.perf: fix build
Broken by kernel updates; NixPkgs master fixed this in a128e443c,
but I decided to be more conservative.
2021-07-29 11:55:38 +02:00
Harrison Houghton 85924eaaa8 bpftools: fix
At some point the name of the doc-tool script changed and we stopped
patching up the shabang line. The new one is just scripts/bpf_doc.py.

(cherry picked from commit 8997f8cc709f6d1801a23de80a7954e48116d1b2)
2021-07-29 09:42:48 +00:00
github-actions[bot] e6c1d10f4b
Merge release-21.05 into staging-next-21.05 2021-07-29 00:03:09 +00:00
Eelco Dolstra 5092dae98d
Merge pull request #131837 from NixOS/backport-131831-to-release-21.05
[Backport release-21.05] nixos-rebuild: Set inherit_errexit
2021-07-28 22:53:44 +02:00
Florian Klink 5d432c2453 linux: 5.13.5 -> 5.13.6
(cherry picked from commit b167e087810dce6f0298f078b0ad621e4bdaaf7f)
2021-07-28 18:15:47 +00:00
github-actions[bot] 98530c2e9e
Merge release-21.05 into staging-next-21.05 2021-07-28 18:02:32 +00:00
Eelco Dolstra 8f5794cbda nixos-rebuild: Set inherit_errexit
Without this, failure of nixBuild() and nixFlakeBuild() was ignored
(since bash doesn't inherit 'set -e' in subshells by default), so the
script would proceed with a bogus ./result link, e.g.

  ++ readlink -f /tmp/nixos-rebuild.NfHKxx/result
  + pathToConfig='/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix
  /tmp/nixos-rebuild.NfHKxx/result'
  + '[' test = switch -o test = boot ']'
  + copyToTarget '/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix
  /tmp/nixos-rebuild.NfHKxx/result'
  + '[' '' = '' ']'
  + '[' test = switch -o test = boot -o test = test -o test = dry-activate ']'
  + targetHostCmd /nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix /tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration test
  + '[' -z '' ']'
  + sudo -- /nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix /tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration test
  error: '/tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration' is not a recognised command
  Try '/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix --help' for more information.
  + echo 'warning: error(s) occurred while switching to the new configuration'
  warning: error(s) occurred while switching to the new configuration

(cherry picked from commit 0ad27c8653daaf59cf0fb2e0b30561a8d86303fa)
2021-07-28 16:32:56 +00:00
Atemu cd82f6616f linux_zen: 5.12.19 -> 5.13.5
(cherry picked from commit caa1c955c94564f9bdafc23f6315f88da1e0da46)
2021-07-28 13:50:45 +02:00
Atemu 55e768eefd linux_lqx: 5.12.17 -> 5.12.19
(cherry picked from commit b15b762d871e1cc4fd08fbea11261de5d78fcd71)
2021-07-28 13:50:30 +02:00
Atemu 4820c77a40 linux_zen: 5.12.14 -> 5.12.19
(cherry picked from commit 349ff1b29e9995b36799c215b475bbb0ba351a45)
2021-07-28 13:50:30 +02:00
Atemu 3650339f63 linux_lqx: 5.12.14 -> 5.12.17
(cherry picked from commit 85f28b5c4f258b3376aade809903132ed1d11f2f)
2021-07-28 13:49:17 +02:00
Jeremy Kolb a8a7b26adb kernel: enable MOUSE_PS2_VMMOUSE
Turns VMware guest mouse support on in the kernel. This is needed for running Wayland and non-root X in a VMWare guest. In a pre-Wayland world the `xf86-input-vmmouse` userspace driver would have handled this for us. This allows the mouse to properly work in a vmware guest (for example it can now leave the vmware window).

See: https://github.com/vmware/open-vm-tools/issues/528
(cherry picked from commit 1207e7581f7bb863d0789c980930464d92d221cb)
2021-07-27 20:36:15 +00:00
github-actions[bot] 0aa5191556
Merge release-21.05 into staging-next-21.05 2021-07-27 06:02:15 +00:00
Domen Kožar 82151321ee
Merge pull request #129773 from pca006132/backport
[21.05] rtw89: init at 2021-07-03
2021-07-27 06:51:03 +02:00
github-actions[bot] 17caed6521
Merge release-21.05 into staging-next-21.05 2021-07-27 00:02:38 +00:00
TredwellGit 8b60c185fa linux_latest-libre: 18165 -> 18191
(cherry picked from commit 2004b7b08dc1d96a5603d3138545865c036a6081)
2021-07-26 15:47:29 +00:00
TredwellGit 2f7a5aa75a linux-rt_5_10: 5.10.47-rt46 -> 5.10.52-rt47
(cherry picked from commit ee688c5c0e5c5a08f292308f1c41be84604c7e43)
2021-07-26 15:47:29 +00:00
TredwellGit 92566fadc9 linux: 5.13.4 -> 5.13.5
(cherry picked from commit 286fa7b708fa932a6955b796628486c13f5fee24)
2021-07-26 15:47:28 +00:00
Michele Guerini Rocco ccae2fed21
Merge pull request #131214 from rnhmjoj/staging-21.05
[21.05] kbd: update search-paths.patch
2021-07-24 09:50:17 +02:00
Jonathan Ringer cab2d34df6 zfsUnstable: 2.1.0-rc8 -> 2.1.0
(cherry picked from commit 6f1b155d37337dc0cf7dc075b9291f3b2dedca69)
2021-07-23 09:19:24 -07:00
TredwellGit 02552c7074 zfsUnstable: 2.1.0-rc7 -> 2.1.0-rc8
https://github.com/openzfs/zfs/releases/tag/zfs-2.1.0-rc8
(cherry picked from commit 5ef8322daa6007ef0256460c0de339f70d718e50)
2021-07-23 09:19:24 -07:00
TredwellGit 5841063b6c zfsUnstable: 2.1.0-rc6 -> 2.1.0-rc7
https://github.com/openzfs/zfs/releases/tag/zfs-2.1.0-rc7
(cherry picked from commit eeb255207df56b2b28745eb53b33e50bb87c3021)
2021-07-23 09:19:24 -07:00
TredwellGit ddb061d9a4 zfsUnstable: 2.1.0-rc5 -> 2.1.0-rc6
https://github.com/openzfs/zfs/releases/tag/zfs-2.1.0-rc6
(cherry picked from commit 917884725dbab2f3855da31b46f9342951cafb57)
2021-07-23 09:19:24 -07:00
Azure Zanculmarktum b9d9d2901f
kbd: update search-paths.patch
Backport of 6f89feaeddacab8ad30909dae968bba5b9a066e7
2021-07-23 11:51:10 +02:00
Janne Heß 8fe750c560 systemd: Patch CVE-2021-33910
(cherry picked from commit b361dcf0bd3610d1fea6b44d72404add188da51d)
2021-07-21 21:56:15 +02:00
TredwellGit 2822d00c6a linux/hardened/patches/5.4: 5.4.133-hardened1 -> 5.4.134-hardened1
(cherry picked from commit ac887a4abc6529cf7817539db2709107cfbad573)
2021-07-21 21:54:48 +02:00
TredwellGit 454e3fc4af linux/hardened/patches/5.12: 5.12.18-hardened1 -> 5.12.19-hardened1
(cherry picked from commit a718b4ae916113e98a4a113ffc52c53106d1bd97)
2021-07-21 21:54:48 +02:00
TredwellGit d528d58746 linux/hardened/patches/5.10: 5.10.51-hardened1 -> 5.10.52-hardened1
(cherry picked from commit 60e9f5c2d76c7892b1031884723a6a3f45e7552e)
2021-07-21 21:54:48 +02:00
TredwellGit 3e9e9473cb linux/hardened/patches/4.19: 4.19.197-hardened1 -> 4.19.198-hardened1
(cherry picked from commit 8bf83e8c874642b020169c201866817bc1c8d402)
2021-07-21 21:54:48 +02:00
TredwellGit 0a96eec012 linux/hardened/patches/4.14: 4.14.239-hardened1 -> 4.14.240-hardened1
(cherry picked from commit 02f4b95e1dfde6c71e230e9b4f17ab4323c306dd)
2021-07-21 21:54:48 +02:00
TredwellGit dacef47f62 linux: 5.4.133 -> 5.4.134
(cherry picked from commit ebd057e9efd8e8810c011b0dba9840109bab65f3)
2021-07-21 21:54:48 +02:00
TredwellGit 6b8d902600 linux: 5.13.3 -> 5.13.4
(cherry picked from commit 5b3a23670c3bdbd3a4ad7e7fe62c4e4c9e0132d9)
2021-07-21 21:54:48 +02:00
TredwellGit 33f224ada6 linux: 5.12.18 -> 5.12.19
(cherry picked from commit a703195804f27720118120bf80fda99531969fe2)
2021-07-21 21:54:48 +02:00
TredwellGit 243d04c444 linux: 5.10.51 -> 5.10.52
(cherry picked from commit f61350ac8916d99611aaf5b8fcb6be120114c7e9)
2021-07-21 21:54:48 +02:00
TredwellGit 6f6efc8dda linux: 4.9.275 -> 4.9.276
(cherry picked from commit c6eff0d2f599621fa4936e2c605823e3489a7044)
2021-07-21 21:54:48 +02:00
TredwellGit 8e34af05ab linux: 4.4.275 -> 4.4.276
(cherry picked from commit 067c21c9647fcc9e38b77b67ad932672374f098f)
2021-07-21 21:54:48 +02:00
TredwellGit 0df57cdc24 linux: 4.19.197 -> 4.19.198
(cherry picked from commit 9c153cccd2e1dbae481ac1578c36017b742adbd2)
2021-07-21 21:54:48 +02:00
TredwellGit 21c1bbc973 linux: 4.14.239 -> 4.14.240
(cherry picked from commit 82af4b58ee24caaec68e3803763c0e6dbedf3784)
2021-07-21 21:54:48 +02:00
TredwellGit ba6476e992 linux/hardened/patches/5.4: 5.4.132-hardened1 -> 5.4.133-hardened1
(cherry picked from commit e87737ca6026c81e81514e447f2a82c7ca56c8a2)
2021-07-20 22:50:51 +00:00
TredwellGit 94ff9e7b2d linux/hardened/patches/5.12: 5.12.17-hardened1 -> 5.12.18-hardened1
(cherry picked from commit 9e10f08e102e10a2a70401dbe1a5707099f61954)
2021-07-20 22:50:51 +00:00
TredwellGit 0d3b5af09e linux/hardened/patches/5.10: 5.10.50-hardened1 -> 5.10.51-hardened1
(cherry picked from commit 8e75e31ae4f6b98cf68d68bdb1ce9ecd6d24a807)
2021-07-20 22:50:50 +00:00
TredwellGit 09c21c10fc linux: 5.4.132 -> 5.4.133
(cherry picked from commit 1e8af69febc3205e403209caa7f0c711d92c2463)
2021-07-20 22:50:50 +00:00
TredwellGit 612d04e1d6 linux: 5.13.2 -> 5.13.3
(cherry picked from commit 72bcb1ace3cfe336d18342d6540733d8e69083a5)
2021-07-20 22:50:50 +00:00
TredwellGit 720802452a linux: 5.12.17 -> 5.12.18
(cherry picked from commit 72d6452921296dda48c531f465c5e37fa91c7c3f)
2021-07-20 22:50:49 +00:00
TredwellGit f1a0f33c5f linux: 5.10.50 -> 5.10.51
(cherry picked from commit a5ee0aede3e3ffacc1bf8f3fb3a9970523cce79e)
2021-07-20 22:50:49 +00:00
Maximilian Bosch 46f9b120e8
Merge pull request #130292 from NixOS/backport-130281-to-release-21.05
[Backport release-21.05] Kernels 2021-07-15
2021-07-20 23:57:39 +02:00
TredwellGit 49809d08b5 linux/hardened/patches/5.4: 5.4.130-hardened1 -> 5.4.132-hardened1
(cherry picked from commit f011a85f289507bef66b10759de524d0467821eb)
2021-07-18 18:59:28 +00:00
TredwellGit e662fb27af linux/hardened/patches/5.12: 5.12.15-hardened1 -> 5.12.17-hardened1
(cherry picked from commit e6ed15ffc466e5bfe32c14a207c8e70abee50dd2)
2021-07-18 18:59:28 +00:00
TredwellGit 1989fef2a9 linux/hardened/patches/5.10: 5.10.48-hardened1 -> 5.10.50-hardened1
(cherry picked from commit b724837096d16e1b64f18228e6ab01ca1dc491ce)
2021-07-18 18:59:28 +00:00
TredwellGit 5a3ca4155f linux/hardened/patches/4.19: 4.19.196-hardened1 -> 4.19.197-hardened1
(cherry picked from commit 888c46fe62dd87556537da8b04684a63be5cb54e)
2021-07-18 18:59:27 +00:00
TredwellGit c060b9e244 linux/hardened/patches/4.14: 4.14.238-hardened1 -> 4.14.239-hardened1
(cherry picked from commit 73667e11f3b8da2237b4e43816d59151b2f7af50)
2021-07-18 18:59:27 +00:00
TredwellGit 0bacfc6d6a linux-rt_5_10: 5.10.47-rt45 -> 5.10.47-rt46
(cherry picked from commit 9e7fd90e153006f1ec5cdd612eb70305c19019db)
2021-07-18 18:59:26 +00:00
TredwellGit 72df626b31 linux: 5.4.130 -> 5.4.132
(cherry picked from commit 5d99998e07ec4f60da6bd0c822356bfecbbbc947)
2021-07-18 18:59:26 +00:00
TredwellGit f507e4793b linux: 5.12.15 -> 5.12.17
(cherry picked from commit 677dcff2aa039ede045ad751da0a0877238ed2cc)
2021-07-18 18:59:26 +00:00
TredwellGit 0f9b1b3bec linux: 5.10.48 -> 5.10.50
(cherry picked from commit a2259ae9a6a48adc580906a9dcfe653f08aa3a94)
2021-07-18 18:59:25 +00:00
TredwellGit 32e57d3b3a linux: 4.19.196 -> 4.19.197
(cherry picked from commit cb978946c1a99c8e6a204d0e45cc7078f331673c)
2021-07-18 18:59:25 +00:00
TredwellGit 13bce99087 linux: 4.14.238 -> 4.14.239
(cherry picked from commit e3eace9baa10d524173e34cad3d2a31c2413f8cc)
2021-07-18 18:59:24 +00:00
Sandro Jäckel efd1d6fe1b treewide: convert all links git.archlinux.org to github.com/archlinux/svntogit-*
(cherry picked from commit 388a4ef42345775a85d823597dadf25d4f0a5209)
2021-07-18 09:17:54 +00:00
TredwellGit 2abfe1a93b firmwareLinuxNonfree: 2021-05-11 -> 2021-07-16
(cherry picked from commit ea4358edf2c5a2280e193c936fb7cbafcbbaa666)
2021-07-17 17:49:43 +00:00
TredwellGit 46309746ce linux_latest-libre: 18132 -> 18165
(cherry picked from commit 26af402042644205fd8369fb63b5b62bdf4d8df0)
2021-07-15 17:25:35 +00:00
TredwellGit 06ce7d7587 linux-rt_5_4: 5.4.123-rt59 -> 5.4.129-rt61
(cherry picked from commit 2913c538914377c93225af91f5a41ac62fb7a34c)
2021-07-15 17:25:34 +00:00
TredwellGit f8217ded54 linux: 5.13.1 -> 5.13.2
(cherry picked from commit d2f67b4efb0f7104ab0d9bc1cd53900140391fe0)
2021-07-15 17:25:34 +00:00
TredwellGit bb58b98cd0 linux: 4.9.274 -> 4.9.275
(cherry picked from commit aa445dcd9a5ff5a2a5af570c3c6c6bf5b7bf0810)
2021-07-15 17:25:34 +00:00
TredwellGit 4df31dbabd linux: 4.4.274 -> 4.4.275
(cherry picked from commit 0637e4c7c665ed148632e561dbf861f75304bae9)
2021-07-15 17:25:33 +00:00
Markus Kowalewski a49908946c linuxptp: 3.1 -> 3.1.1
fixes CVEs 2021-3570 and 2021-3571

(cherry picked from commit 4d881f91494fed25350ec77239a7d06ff08fa91a)
2021-07-10 11:29:04 +00:00
pca006132 b675049ea4 rtw89: init at 2021-07-03 (#129325)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
(cherry picked from commit 7d8653652999ff29ed5e8f4d00ca7d5d1f14e9c3)
2021-07-10 00:57:06 +08:00
TredwellGit cf4327321a linux/hardened/patches/5.4: 5.4.129-hardened1 -> 5.4.130-hardened1
(cherry picked from commit 43fba78fec7c1f00ca8766e27894537fdd3eeb47)
2021-07-09 10:48:18 +00:00
TredwellGit 50cc793e18 linux/hardened/patches/5.12: 5.12.14-hardened1 -> 5.12.15-hardened1
(cherry picked from commit 9af983cd004bb51a80c05945eddf922c56359ccd)
2021-07-09 10:48:18 +00:00
TredwellGit 84cb8b4796 linux/hardened/patches/5.10: 5.10.47-hardened1 -> 5.10.48-hardened1
(cherry picked from commit b36d829bb1af3c8fdd38d2f217d31450b02b8526)
2021-07-09 10:48:18 +00:00
TredwellGit 2e9e07c10b linux-rt_5_10: 5.10.41-rt42 -> 5.10.47-rt45
(cherry picked from commit 25b73ac6a2422711dda132bf88ad510a37df95f2)
2021-07-09 10:48:17 +00:00
TredwellGit 2d453b51a6 linux: 5.4.129 -> 5.4.130
(cherry picked from commit 32235d48681bf913b9d5435c518494b77d63f933)
2021-07-09 10:48:17 +00:00
TredwellGit f0b011fd73 linux: 5.13 -> 5.13.1
(cherry picked from commit ea4cb239528062ac52fc1d4aa2bbf115df9105dc)
2021-07-09 10:48:17 +00:00
TredwellGit fef417a726 linux: 5.12.14 -> 5.12.15
(cherry picked from commit e0f9f09c1740d0d80ead4002016bd3df0fc1b197)
2021-07-09 10:48:16 +00:00
TredwellGit d7353f445e linux: 5.10.47 -> 5.10.48
(cherry picked from commit 9462b074a8f2f34f3a4dd6b56ff22f760a8301f0)
2021-07-09 10:48:16 +00:00
Maximilian Bosch 6056345805
Merge pull request #129349 from NixOS/backport-128538-to-release-21.05
[Backport release-21.05] Kernels 2021-06-28
2021-07-08 19:56:38 +02:00
Jörg Thalheim 7a41876e2e
Merge pull request #129568 from NixOS/backport-127917-to-release-21.05
[Backport release-21.05] linux-kernel: Add dell drivers on 5.12+
2021-07-08 07:09:19 +01:00
roblabla a9eb5aa7ff linux-kernel: Add dell drivers on 5.12+
(cherry picked from commit be03cf01f30d5319c7f1629a23265655711b9d07)
2021-07-07 19:38:21 +00:00
Atemu 261e8c7b98 zen-kernels: 5.12.9 -> 5.12.14
(cherry picked from commit 6733b6fb0569762d4fe7204613224545d54a55c8)
2021-07-07 10:41:19 +00:00
Vladimír Čunát 9d1350d9d5
Merge #129412: makeself: disable tests for now
Also improve the busybox-sandbox-shell.
(cherry picked from commit 00c86ad14639887ec495b92ada9cd93a75317686)
The makeself problem is blocking the nixos-21.05 channel now.
2021-07-06 21:55:52 +02:00
fortuneteller2k 111c0c12be linux_xanmod: 5.12.13 -> 5.13.0
(cherry picked from commit 741f6efc6bac0c79f5f280bf0e1e8fa82c9020af)
2021-07-06 10:24:47 +08:00
fortuneteller2k 3cd12115c5 linux_xanmod: 5.12.12 -> 5.12.13
(cherry picked from commit 419e4299a6a393fb514048dfe57a391f939a721b)
2021-07-05 14:55:17 -07:00
Yurii Matsiuk d06db41bb7 linux/hardened/patches/5.4: 5.4.127-hardened1 -> 5.4.129-hardened1
(cherry picked from commit 338286e6b05edee0faabbf0685b05dc6f2a5be44)
2021-07-05 18:13:10 +00:00
Yurii Matsiuk 24d3d7b72c linux/hardened/patches/5.12: 5.12.12-hardened1 -> 5.12.14-hardened1
(cherry picked from commit 6643bf87ae69a2e3edcbc47f2dc841246e02372e)
2021-07-05 18:13:09 +00:00
Yurii Matsiuk faa6d6b9b1 linux/hardened/patches/5.10: 5.10.45-hardened1 -> 5.10.47-hardened1
(cherry picked from commit 344bf9c20e10e5484a72d3dc1a77d31d1aed9e84)
2021-07-05 18:13:09 +00:00
Yurii Matsiuk 99d53a0c89 linux/hardened/patches/4.19: 4.19.195-hardened1 -> 4.19.196-hardened1
(cherry picked from commit 5a058ab3846b568ee71b6356fa35d1e383e6ce27)
2021-07-05 18:13:09 +00:00
Yurii Matsiuk 15f8e24bc6 linux/hardened/patches/4.14: 4.14.237-hardened1 -> 4.14.238-hardened1
(cherry picked from commit c7323350678a84f0557d475e94887fe94005086b)
2021-07-05 18:13:09 +00:00
Yurii Matsiuk 926c9aabc7 linux: 5.4.127 -> 5.4.129
(cherry picked from commit 5da58d1f67170c3dd5da6fc86d38f0d28abe4f12)
2021-07-05 18:13:08 +00:00
Yurii Matsiuk b0214fccfb linux: 5.12.12 -> 5.12.14
(cherry picked from commit d28212b0842fea0e03376247320f7b41da4abef1)
2021-07-05 18:13:08 +00:00
Yurii Matsiuk a18dea6fb6 linux: 5.10.45 -> 5.10.47
(cherry picked from commit f52103a4e69179631828d453ba0ca68add15952c)
2021-07-05 18:13:08 +00:00
Yurii Matsiuk dc34cf70c8 linux: 4.9.273 -> 4.9.274
(cherry picked from commit 24a5777be9e967bef974fb769b386665b671a6af)
2021-07-05 18:13:07 +00:00
Yurii Matsiuk e168b5bcc9 linux: 4.4.273 -> 4.4.274
(cherry picked from commit ffdd1ac7768c9eb5a1f0a134adc0e5ce473ca3a5)
2021-07-05 18:13:07 +00:00
Yurii Matsiuk d638fb5525 linux: 4.19.195 -> 4.19.196
(cherry picked from commit a5394f31e8cc9f24a549d6070ee6153e1f946537)
2021-07-05 18:13:07 +00:00
Yurii Matsiuk 78ff5dfec2 linux: 4.14.237 -> 4.14.238
(cherry picked from commit 1c15f4eef1c304e8d89a2f42554c503c4925e1cf)
2021-07-05 18:13:06 +00:00
Yurii Matsiuk bc1ca1fa6b Revert "linux: fix regression in bridge VLAN configuration"
This reverts commit 24a08441d52480cf3332a100e24fdf9b83a8351a.

(cherry picked from commit 2f0d1e41e254e55e2668f19faf2f307598e43f6e)
2021-07-05 18:13:06 +00:00
Jörg Thalheim fe80e34fef
Merge pull request #126738 from NixOS/backport-126060-to-release-21.05
[Backport release-21.05] dpdk-kmods: init at 2021-04-21
2021-07-03 05:06:36 +01:00
Yurii Matsiuk 23b6a0735b linux_5_13: init at 5.13
(cherry picked from commit 367a53a82b0a3ffe6c1ea4261c22764129994669)
2021-07-02 13:50:19 -07:00
Lengyel Balázs db3b901f0b linux-kernel: update config for 5.13
(cherry picked from commit 2ac508d578a99c447fabf97fa7b788062da70b95)
2021-07-02 13:50:19 -07:00
Andrew Childs f77d176ec6 root: use pure CoreSymbolication on Darwin
The current build works by linking against CoreSymbolication in
/System/Library/PrivateFrameworks. This is impure and doesn't work in
newer versions of macOS.

See https://github.com/NixOS/nixpkgs/issues/128576

(cherry picked from commit 55dcd998597257714c4a5362c14845a9363dde66)
2021-07-01 13:56:15 -07:00
Sandro 990eb36e53 Update pkgs/os-specific/linux/mwprocapture/default.nix
(cherry picked from commit 92d2a0ddeeb5e19e1bb3c43996bc0a18ddaf13a9)
2021-06-28 08:37:52 -07:00
Phil Wetzel 9af0e6e076 mwprocapture: 1.2.4177 -> 1.3.0.4236
(cherry picked from commit 4f22c47193b2608d4d28cd831d54c5bd384a29a5)
2021-06-28 08:37:52 -07:00
Marco A L Barbosa b8b8cfa29c audit: use hostPlatform.isStatic instead of targetPlatform.isStatic
(cherry picked from commit 0034539abab37c4cfbc281a084cf111a16e8a21d)
2021-06-25 17:54:58 +00:00
Robert Schütz 001f78ff00 zfs: 2.0.4 -> 2.0.5
https://github.com/openzfs/zfs/releases/tag/zfs-2.0.5
(cherry picked from commit ec8dbc11aac4b4d7f6e9c8329952bd03dbfc98bf)
2021-06-24 16:01:59 -07:00
Maximilian Bosch 2f752379bc
Merge pull request #127789 from fortuneteller2k/backport-xanmod
[21.05] linux_xanmod: 5.12.5 -> 5.12.12
2021-06-23 15:23:16 +02:00
fortuneteller2k 6fb054dda0 linux_xanmod: 5.12.5 -> 5.12.12
(cherry picked from commit 4fa80ae13ab707bd11074cf18d6203f15d65f613)
2021-06-22 22:20:24 +08:00
TredwellGit 220b8ca902 linux: fix regression in bridge VLAN configuration
(cherry picked from commit 24a08441d52480cf3332a100e24fdf9b83a8351a)
2021-06-22 08:41:57 +00:00
TredwellGit 1f180eafdb linux/hardened/patches/5.4: 5.4.126-hardened1 -> 5.4.127-hardened1
(cherry picked from commit df60fdef552ef8a1aaaf3b63a0e7941165a2e893)
2021-06-22 08:41:57 +00:00
TredwellGit d2c67458d9 linux/hardened/patches/5.12: 5.12.11-hardened1 -> 5.12.12-hardened1
(cherry picked from commit d1e2575c4c7114ab1f6e2f7fd0fda2918d0e7a89)
2021-06-22 08:41:57 +00:00