Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #54752 from eadwu/bcachefs/20190123 | Vladyslav M | 2019-02-04 |
|\ | | | | | linux_testing_bcachefs,bcachefs-tools: 20190123 | ||
| * | linux_testing_bcachefs: 4.18.2018.10.12 -> 4.20.2019.01.23 | Edmund Wu | 2019-01-27 |
| | | |||
* | | linux: 5.0-rc4 -> 5.0-rc5 | Tim Steinbach | 2019-02-03 |
| | | |||
* | | batman-adv: 2018.4 -> 2019.0 | Franz Pletz | 2019-02-03 |
| | | |||
* | | linux: Removes the previously removed raspberry pi patch | Samuel Dionne-Riel | 2019-02-02 |
| | | | | | | | | There seems to have been an oopsie with the rebase. | ||
* | | Revert "linuxPackages_4_{19,20}: works around bug with overlayfs." | Samuel Dionne-Riel | 2019-02-02 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit de86af48faa03a824917ac90f4776481c7ce9e54. (Manual revert due to conflicts.) See #54509 The patch is causing overlayfs to misbehave. | ||
* | | Merge pull request #53425 from dtzWill/update/fwupd-1.2.3 | Jan Tojnar | 2019-01-31 |
|\ \ | | | | | | | | | | | | | fwupd: 1.2.1 -> 1.2.3 Co-authored-by: Jan Tojnar <jtojnar@gmail.com> | ||
| * | | fwupd: fix installed tests | Jan Tojnar | 2019-01-28 |
| | | | |||
| * | | fwupd: put plugins in "out", restore "lib" output w/o cycle | Will Dietz | 2019-01-27 |
| | | | |||
| * | | fwupd: blacklist test plugin by default | Will Dietz | 2019-01-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't add the testing "webcam" device, which is unexpected to see when querying what devices fwupd believes exist :). Won't change behavior for anyone defining the blacklistPlugin option already, but doesn't seem worth making more complicated. | ||
| * | | fwupd: 1.2.2 -> 1.2.3 | Will Dietz | 2019-01-27 |
| | | | | | | | | | | | | Drop lib output to avoid cycle. | ||
* | | | Merge pull request #54879 from markuskowa/upd-rdma-core | markuskowa | 2019-01-31 |
|\ \ \ | | | | | | | | | rdma-core: 21 -> 22 | ||
| * | | | rdma-core: 21 -> 22 | Markus Kowalewski | 2019-01-28 |
| | | | | |||
* | | | | Merge pull request #54977 from teto/kernel_fix | Joachim F | 2019-01-31 |
|\ \ \ \ | | | | | | | | | | | linux: (re)take into account extraConfig | ||
| * | | | | linux: (re)take into account extraConfig | Matthieu Coudron | 2019-01-31 |
| | | | | | | | | | | | | | | | | | | | | PR #42838 wrongly started to ignore extraConfig. This fixes that. | ||
* | | | | | Merge pull request #54801 from matthewbauer/fix-trace-pos | Matthew Bauer | 2019-01-31 |
|\ \ \ \ \ | | | | | | | | | | | | | make-derivation: fix position in trace | ||
| * | | | | | Revert "mingw: use current package set for headers" | Matthew Bauer | 2019-01-28 |
| | |/ / / | |/| | | | | | | | | | | | | | This reverts commit 03072036937c250976f0522b070eefe96e8ab0f1. | ||
* | | | | | linux: 4.20.5 -> 4.20.6 | Tim Steinbach | 2019-01-31 |
| | | | | | |||
* | | | | | linux: 4.19.18 -> 4.19.19 | Tim Steinbach | 2019-01-31 |
| | | | | | |||
* | | | | | linux: 4.14.96 -> 4.14.97 | Tim Steinbach | 2019-01-31 |
| | | | | | |||
* | | | | | linux: 4.9.153 -> 4.9.154 | Tim Steinbach | 2019-01-31 |
| |/ / / |/| | | | |||
* | | | | Merge pull request #54258 from aij/zfs | Jörg Thalheim | 2019-01-30 |
|\ \ \ \ | | | | | | | | | | | zfsUnstable: 0.8.0-rc2 -> 0.8.0-rc3 | ||
| * | | | | zfsUnstable: Fetch source by tag and patch by hash. | Ivan Jager | 2019-01-19 |
| | | | | | |||
| * | | | | zfsUnstable: 0.8.0-rc2 -> 0.8.0-rc3 | Ivan Jager | 2019-01-17 |
| | | | | | |||
* | | | | | Merge pull request #54769 from tadeokondrak/update-libratbag | Silvan Mosberger | 2019-01-29 |
|\ \ \ \ \ | |_|/ / / |/| | | | | libratbag: 0.9.903 -> 0.9.904 | ||
| * | | | | libratbag: 0.9.903 -> 0.9.904 | Tadeo Kondrak | 2019-01-28 |
| | | | | | |||
* | | | | | Merge pull request #42838 from teto/kernel_autoconf | Silvan Mosberger | 2019-01-28 |
|\ \ \ \ \ | |/ / / / |/| | | | | [RFC] add ability to merge structured configs | ||
| * | | | | linux: convert hardened-config to a structured one | Matthieu Coudron | 2019-01-28 |
| | | | | | |||
| * | | | | linux: ability to merge structured configs | Matthieu Coudron | 2019-01-28 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | ||
* / | | | linux: 4.20-rc4 -> 4.20-rc5 | Tim Steinbach | 2019-01-27 |
|/ / / | |||
* | | | linux: 4.20.4 -> 4.20.5 | Tim Steinbach | 2019-01-27 |
| | | | |||
* | | | linux: 4.19.17 -> 4.19.18 | Tim Steinbach | 2019-01-27 |
| | | | |||
* | | | linux: 4.14.95 -> 4.14.96 | Tim Steinbach | 2019-01-27 |
| | | | |||
* | | | linux: 4.9.152 -> 4.9.153 | Tim Steinbach | 2019-01-27 |
| | | | |||
* | | | linux: 4.4.171 -> 4.4.172 | Tim Steinbach | 2019-01-27 |
| | | | |||
* | | | Merge pull request #53907 from dtzWill/update/bcc-0.8.0 | Will Dietz | 2019-01-27 |
|\ \ \ | | | | | | | | | bcc: 0.7.0 -> 0.8.0 | ||
| * | | | bcc: 0.7.0 -> 0.8.0 | Will Dietz | 2019-01-13 |
| | | | | |||
* | | | | Merge pull request #54059 from dtzWill/update/fwts-19.01.00 | Will Dietz | 2019-01-27 |
|\ \ \ \ | | | | | | | | | | | fwts: 18.12.00 -> 19.01.00 | ||
| * | | | | fwts: 18.12.00 -> 19.01.00 | Will Dietz | 2019-01-16 |
| | |/ / | |/| | | | | | | | | | | https://wiki.ubuntu.com/FirmwareTestSuite/ReleaseNotes/19.01.00 | ||
* | | | | conky: journal support | Tim Steinbach | 2019-01-26 |
| | | | | |||
* | | | | Merge pull request #54619 from Mic92/remove-wkennington | Jörg Thalheim | 2019-01-26 |
|\ \ \ \ | | | | | | | | | | | treewide: remove wkennington as maintainer | ||
| * | | | | treewide: remove wkennington as maintainer | Jörg Thalheim | 2019-01-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | He prefers to contribute to his own nixpkgs fork triton. Since he is still marked as maintainer in many packages this leaves the wrong impression he still maintains those. | ||
* | | | | | systemd-cryptsetup-generator: fixup linkage | Vladimír Čunát | 2019-01-26 |
|/ / / / | | | | | | | | | | | | | | | | | It got broken by 74a64a8a6 #53483. But IMO it's *this* expression that was written in a too fragile way. | ||
* | | | | conky: 1.11.1 -> 1.11.2 | Tim Steinbach | 2019-01-25 |
| | | | | |||
* | | | | darwin.xcode: update hashes | Matthew Bauer | 2019-01-25 |
| | | | | |||
* | | | | Merge pull request #53511 from joachifm/kernel-32bit-emu-feature-flag | Joachim F | 2019-01-25 |
|\ \ \ \ | | | | | | | | | | | linux: flag to indicate 32bit emulation support | ||
| * | | | | linux: add feature flag to indicate support for 32bit emulation | Joachim Fasting | 2019-01-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Motivated by the need to warn users trying to build configurations that depend on being able to run 32bit apps on 64bit kernels. | ||
* | | | | | Merge pull request #54516 from matthewbauer/column | Silvan Mosberger | 2019-01-24 |
|\ \ \ \ \ | | | | | | | | | | | | | unixtools.utillinux: add column | ||
| * | | | | | unixtools.utillinux: add column | Matthew Bauer | 2019-01-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | requested on IRC | ||
* | | | | | | linux: 4.9.151 -> 4.9.152 | Tim Steinbach | 2019-01-23 |
| | | | | | |