Commit Graph

2973 Commits

Author SHA1 Message Date
Vladimír Čunát c721be4008 Merge #55845: linux-hardkernel: 4.14.87-153 -> 4.14.94-155 2019-02-19 09:16:01 +01:00
Tim Steinbach d607715ab3 linux: 5.0-rc6 -> 5.0-rc7
Also remove interpreter truncation patch, no longer needed in package tree.
2019-02-18 21:11:21 -05:00
Linus Heckemann be38a70184 linux: enable SND_OSSEMUL
Fixes #54074
2019-02-18 17:11:37 +01:00
qoli ed76b12e3a linux-hardkernel: 4.14.87-153 -> 4.14.94-155 2019-02-15 10:36:38 -08:00
Tim Steinbach 93e9b53b96 linux: 4.20.8 -> 4.20.10 2019-02-15 10:01:36 -05:00
Tim Steinbach 8c14948343 linux: 4.19.21 -> 4.19.23 2019-02-15 10:01:36 -05:00
Tim Steinbach 7954ec0ffd linux: 4.14.99 -> 4.14.101 2019-02-15 10:01:36 -05:00
Tim Steinbach 50f518c93f linux: 4.9.156 -> 4.9.158 2019-02-15 10:01:36 -05:00
Edmund Wu f0b8a113dd linux: allow for interpreter to be truncated
via https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cb5b020a8d38f77209d0472a0fea755299a8ec78
see https://github.com/NixOS/nixpkgs/issues/53672
2019-02-14 21:01:00 -05:00
Edmund Wu 13d1ba3439 Revert "Revert "linux: 4.14.98 -> 4.14.99""
This reverts commit 01d8894c4d.
2019-02-14 21:01:00 -05:00
Jörg Thalheim 0ac83f0857 Merge pull request #55499 from eadwu/bcachefs/20190209
linux_testing_bcachefs,bcachefs-tools: 20190209
2019-02-14 16:18:05 +00:00
Vladimír Čunát 01d8894c4d Revert "linux: 4.14.98 -> 4.14.99"
This reverts commit 0e1eb30a1d.
It broke the installer tests, e.g. https://hydra.nixos.org/build/88704861
2019-02-13 22:55:36 +01:00
Tim Steinbach 117eb5725a linux-libre: 15814 -> 15951 2019-02-12 19:00:16 -05:00
Tim Steinbach d174713a12 linux: 4.20.7 -> 4.20.8 2019-02-12 18:45:31 -05:00
Tim Steinbach c7e17fa49c linux: 4.19.20 -> 4.19.21 2019-02-12 18:44:55 -05:00
Tim Steinbach 0e1eb30a1d linux: 4.14.98 -> 4.14.99 2019-02-12 18:44:35 -05:00
Tim Steinbach a629651af2 linux: 4.9.155 -> 4.9.156 2019-02-12 18:44:12 -05:00
Tim Steinbach f11e1c1135 linux: 5.0-rc5 -> 5.0-rc6 2019-02-11 16:23:06 -05:00
Edmund Wu 14a5c27743 linux_testing_bcachefs: 4.20.2019.01.23 -> 4.20.2019.02.09 2019-02-09 21:11:12 -05:00
Tim Steinbach 0f6571bae8 linux: 4.4.173 -> 4.4.174 2019-02-08 08:19:23 -05:00
Tim Steinbach c7191de7db linux: 4.4.172 -> 4.4.173 2019-02-06 14:40:38 -05:00
Tim Steinbach 7b0bf31a74 linux: 4.20.6 -> 4.20.7 2019-02-06 13:23:47 -05:00
Tim Steinbach 7870ada549 linux: 4.19.19 -> 4.19.20 2019-02-06 13:23:37 -05:00
Tim Steinbach bd7e5b51b5 linux: 4.14.97 -> 4.14.98 2019-02-06 13:23:24 -05:00
Tim Steinbach 117551ce2a linux: 4.9.154 -> 4.9.155 2019-02-06 13:23:03 -05:00
Vladyslav M 8626808c72 Merge pull request #54752 from eadwu/bcachefs/20190123
linux_testing_bcachefs,bcachefs-tools: 20190123
2019-02-04 22:53:38 +02:00
Tim Steinbach c77728de7b linux: 5.0-rc4 -> 5.0-rc5 2019-02-03 19:31:25 -05:00
Samuel Dionne-Riel 09af2fb9e0 linux: Removes the previously removed raspberry pi patch
There seems to have been an oopsie with the rebase.
2019-02-02 14:29:01 -05:00
Samuel Dionne-Riel 196af4b359 Revert "linuxPackages_4_{19,20}: works around bug with overlayfs."
This reverts commit de86af48faa03a824917ac90f4776481c7ce9e54.

(Manual revert due to conflicts.)

See #54509

The patch is causing overlayfs to misbehave.
2019-02-02 12:18:16 -05:00
Joachim F bc84a22989 Merge pull request #54977 from teto/kernel_fix
linux: (re)take into account extraConfig
2019-01-31 19:46:11 +00:00
Tim Steinbach 705207ec9b linux: 4.20.5 -> 4.20.6 2019-01-31 07:19:07 -05:00
Tim Steinbach e4c1ce97c3 linux: 4.19.18 -> 4.19.19 2019-01-31 07:18:36 -05:00
Tim Steinbach f623daca21 linux: 4.14.96 -> 4.14.97 2019-01-31 07:18:23 -05:00
Tim Steinbach 468b6cea72 linux: 4.9.153 -> 4.9.154 2019-01-31 07:17:38 -05:00
Matthieu Coudron a5a796222b linux: (re)take into account extraConfig
PR #42838 wrongly started to ignore extraConfig. This fixes that.
2019-01-31 13:34:42 +09:00
Silvan Mosberger 51d2eed83b Merge pull request #42838 from teto/kernel_autoconf
[RFC] add ability to merge structured configs
2019-01-28 10:38:00 +01:00
Tim Steinbach e1ddb90ca8 linux: 4.20-rc4 -> 4.20-rc5 2019-01-27 20:56:23 -05:00
Edmund Wu da0fbf4dd7 linux_testing_bcachefs: 4.18.2018.10.12 -> 4.20.2019.01.23 2019-01-27 20:46:55 -05:00
Matthieu Coudron 7aacbdb898 linux: convert hardened-config to a structured one 2019-01-28 09:07:24 +09:00
Matthieu Coudron 3bb7b3f02e linux: ability to merge structured configs
This should make the composability of kernel configurations more straigthforward.

- now distinguish freeform options from tristate ones
- will look for a structured config in kernelPatches too
one can now access the structuredConfig from a kernel via linux_test.configfile.structuredConfig
in order to reinject it into another kernel, no need to rewrite the config from scratch

The following merge strategies are used in case of conflict:
-- freeform items must be equal or they conflict (mergeEqualOption)
-- for tristate (y/m/n) entries, I use the mergeAnswer strategy which takes the best available value, "best" being defined by the user (by default "y" > "m" > "n", e.g. if one entry is both marked "y" and "n", "y" wins)
-- if one item is both marked optional/mandatory, mandatory wins (mergeFalseByDefault)
2019-01-28 09:06:33 +09:00
Tim Steinbach 39fdfd0eb1 linux: 4.20.4 -> 4.20.5 2019-01-27 16:12:13 -05:00
Tim Steinbach 4ab5604c85 linux: 4.19.17 -> 4.19.18 2019-01-27 16:12:13 -05:00
Tim Steinbach 19505bb8d1 linux: 4.14.95 -> 4.14.96 2019-01-27 16:12:12 -05:00
Tim Steinbach 4606793349 linux: 4.9.152 -> 4.9.153 2019-01-27 16:12:12 -05:00
Tim Steinbach 6df6bb42b5 linux: 4.4.171 -> 4.4.172 2019-01-27 16:12:12 -05:00
Joachim F f6414428ed Merge pull request #53511 from joachifm/kernel-32bit-emu-feature-flag
linux: flag to indicate 32bit emulation support
2019-01-25 14:13:45 +00:00
Tim Steinbach 8ee43e01fa linux: 4.9.151 -> 4.9.152 2019-01-23 07:10:45 -05:00
Tim Steinbach 6da5e2d45f linux: 4.20.3 -> 4.20.4 2019-01-23 07:10:35 -05:00
Tim Steinbach 1b8beae40b linux: 4.19.16 -> 4.19.17 2019-01-23 07:10:27 -05:00
Tim Steinbach 5f0a4ee69f linux: 4.14.94 -> 4.14.95 2019-01-23 07:10:18 -05:00