1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-15 00:54:46 +00:00
Commit graph

4732 commits

Author SHA1 Message Date
Nikolay Amiantov 34769a3d72 Merge pull request #12508 from heydojo/ati-drivers-backport
ati-drivers: Restore opengl & direct rendering
2016-01-23 12:00:19 +03:00
Vladimír Čunát 0957359568 Merge branch 'staging' 2016-01-22 13:48:35 +01:00
aszlig 8c4256e651
lvm2: 2.02.132 -> 2.02.140
Upstream changelog can be found at:

https://git.fedorahosted.org/cgit/lvm2.git/tree/WHATS_NEW?h=v2_02_140&id=0faa27d4f55abcda5fa94ef92343eb44e95ada89

I have tested this with:

nix-build nixos/release.nix -A tests.installer.lvm.x86_64-linux

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-22 13:30:43 +01:00
Luca Bruno 4ac19877d7 Merge pull request #12522 from mbakke/bluez-5.37
bluez5: 5.36 -> 5.37
2016-01-21 21:21:27 +01:00
aszlig 05fed13de3
multipath_tools: Cleanup and update to v0.5.0
Previously, version 0.4.9 was a tarbomb and in version 0.5.0 this
fortunately isn't the case anymore so we don't need to set sourceRoot by
ourselves.

I've also moved the definition of makeFlagsArray to the attribute
makeFlags, because we can use $(var) to substitute shell variables
within make.

The references to /lib/udev/scsi_id no longer exist in version 0.5.0 and
it seems that libudev is used directly.

Nevertheless, there are still references to FHS paths such as /var/run,
/etc/multipath.conf and /etc/multipath but these are only relevant at
runtime and can be configured to point to a different path elsewhere.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-21 16:18:13 +01:00
Marius Bakke 889ebe6b28 bluez5: 5.36 -> 5.37 2016-01-21 14:39:52 +00:00
Tony White 722c616b8f ati-drivers: Restore opengl & direct rendering
- Removed a collision in the nix store
- Removed dependency on qt
- Fixed opengl and direct rendering by correcting some link paths
- Some code refactored in builder.sh
- Comments added/modified

This pull request fixes #11740 and I recommend that it be considered
as a hotfix for the stable channel due to the fact that opengl
and direct rendering are broken there too.
2016-01-20 19:51:52 +00:00
Vladimír Čunát 4824f73cb3 linux-4.2: remove as it's no longer maintained upstream
grsecurity still holds a reference to it,
but I prefer it to fail than to use a version
that is most likely not secure anymore.
2016-01-20 20:15:07 +01:00
Nathan Zadoks 23f5e3c90f linux: patch CVE-2016-0728 (close #12492)
The PoC provided successfully escalates privileges from a local user to
root. The vulnerability affects any Linux Kernel version 3.8 and higher.
http://perception-point.io/2016/01/14/analysis-and-exploitation-of-a-linux-kernel-vulnerability-cve-2016-0728/
2016-01-20 09:31:53 +01:00
Guillaume Maudoux f8ff4691ed linux-mptcp: init at 0.90 (kernel 3.18.20), fixes #11149 2016-01-20 02:11:09 +01:00
Tuomas Tynkkynen 69ba6c1d30 mmc-utils: init at 2015-11-18, fixes #12489 2016-01-20 01:50:34 +01:00
Ricardo M. Correia d51204e8de zfs: 0.6.5.3 -> 0.6.5.4 2016-01-19 16:34:14 +01:00
Ricardo M. Correia fe53cb56d9 spl: 0.6.5.3 -> 0.6.5.4 2016-01-19 16:34:14 +01:00
Vladimír Čunát 72e6e6a483 tarball: fix evaluation of mdadm on darwin
It probably doesn't make any sense to have mdadm on darwin,
but we have to "fail in a right way".
2016-01-18 15:05:38 +01:00
Robin Gloster 53b389327e refactor to use autoreconfHook where possible
Close #12446.
2016-01-18 10:45:31 +01:00
Vladimír Čunát 620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
aszlig 011c149ed5
mdadm: Set allowedReferences to only include libc.
The updates we had in the past (7719f7f and 1faf610) broke the mdadm
installer test and systems in the wild using mdraid because newer mdadm
versions contained a self-referenc to its own store path.

Instead of putting a big warning about updating in the package
expression, let's just add allowedReferences so the build immediately
fails if there is a self-reference.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 04:21:16 +01:00
aszlig 5e227e6f1d
mdadm: Clean up package expression.
Let's use makeFlags directly instead of stitching together a
makeFlagsArray in preBuild.

This should make the expression much more readable and clean.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 04:21:16 +01:00
aszlig bcd31d0acb
mdadm: 3.3 -> 3.3.4
Okay, this update is a bit more tricky and the patch I've included is
not very nice to be honest.

So the patch causes "mdadm --udev-rules" to search for the right store
path using /proc/self/exec. This has the disadvantage that we could end
up having /run/current-system/bin/mdadm in the rule file.

But on the other hand, when we're on NixOS, we don't need to use that
command *at*all*, so we should be safe.

The patch also sets BINDIR to /sbin, which causes the included rule and
systemd files to not work out of the box on NixOS. But we have a
substituteInPlace where we do rewrite /sbin/mdadm to the right store
path in our udev rule generator, so that shouldn't be an issue.

I've tested this using the mdraid installer test and it succeeded.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-18 04:21:15 +01:00
koral dd4dd8c87a conky: 1.10.0 -> 1.10.1 2016-01-17 11:22:10 +01:00
Pascal Wittmann edeaa7d26c linuxConsoleTools: 1.4.8 -> 1.4.9 2016-01-15 21:36:23 +01:00
Simon Jagoe 42d4175e4e kernel: 4.1.13 -> 4.1.15 (close #12408) 2016-01-15 19:59:52 +01:00
Vladimír Čunát 2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Svein Ove Aas 805d453bc2 nvidia: branch update 352.63 -> 358.16 (close #12272)
Tested & reviewed by vcunat:
- the patch seems not needed anymore,
- reflects changes in their build system
  ftp://download.nvidia.com/XFree86/packaging/linux/new-kbuild-for-355/README
2016-01-14 12:32:53 +01:00
Al Zohali 860d8c3a55 rt5677-firmware: init at 20160110 2016-01-13 22:43:19 +03:00
Al Zohali a3a5bc6095 linux_chromiumos_3_14: init at 3.14.0
Co-authored-by: Nikolay Amiantov <ab@fmap.me>
2016-01-13 22:43:19 +03:00
Al Zohali ee9e7b7224 linux_chromiumos_3_18: init at 3.18.0
Co-authored-by: Nikolay Amiantov <ab@fmap.me>
2016-01-13 22:43:19 +03:00
Nikolay Amiantov 957b09d61a android-udev-rules: 20151108 -> 20151209 2016-01-13 21:21:43 +03:00
lethalman e1eea5ad7f Merge pull request #12360 from kragniz/powertop-v2.8
powertop: 2.7 -> 2.8
2016-01-13 14:18:52 +01:00
Louis Taylor 6ac550a3e9 powertop: 2.7 -> 2.8
Removed patch, since an equivalent fix was made upstream and included in
the 2.8 release.
2016-01-13 12:06:33 +00:00
Louis Taylor 2dd99b8abb kmod: 21 -> 22 2016-01-13 11:46:15 +00:00
Tobias Geerinckx-Rice 5904738557 regionset: 20030629 -> 0.2
Later version with cleaned-up code and a very basic man page.
2016-01-13 03:30:56 +01:00
Shea Levy 44274f62f5 linux: Add 4.4 2016-01-12 19:39:00 -05:00
Lluís Batlle i Rossell 1792ca5810 Increasing mmc possible partitions from 8 to 32.
In kernel common config. I have a modern tablet with 18 gpt partitions
on eMMC (Android+Win10 dualboot).
2016-01-11 09:27:58 +01:00
Tim Steinbach f318049964 kernel: 4.3.2 -> 4.3.3 2016-01-11 02:08:31 +00:00
Tobias Geerinckx-Rice 228774aaf5 wis_go7007: remove dead package & module
Broken since 2014, but basically a package from 2008 with no
upstream.
2016-01-11 00:16:01 +01:00
Aristid Breitkreuz 6fc1c08324 Merge pull request #12143 from NeQuissimus/kernel440rc8
linux-testing: 4.4.0-rc7 -> 4.4.0-rc8
2016-01-10 21:07:46 +01:00
Aristid Breitkreuz 9c92faf370 Merge pull request #12133 from dwe11er/new-package/irqbalance
irqbalance: init at 1.1.0
2016-01-10 21:06:50 +01:00
Dan Peebles a3dcb3051d apple-source-releases: bump many packages to 10.10.5
This also changes the versioning scheme to be in more "human-meaningful"
terms, so instead of the internal release numbers we talk about 10.10.5
or 10.9.5.
2016-01-10 14:53:44 -05:00
Dan Peebles a63fa339a5 cctools-port: bump to 877.5 2016-01-10 12:16:43 -05:00
Vladimír Čunát 3769692a38 iptables: add in-code warning about updates
/cc #12178.
2016-01-08 18:32:48 +01:00
Marcin Falkiewicz 7636359c89 irqbalance: init at 1.1.0 2016-01-08 12:37:43 +01:00
Eelco Dolstra f9cf253e61 Merge pull request #12178 from mdorman/revert-iptables
Revert "iptables: 1.4.21 -> 1.6.0"
2016-01-08 10:45:53 +01:00
Shea Levy 57e0febda6 Merge branch 'pkg/batman-adv-2015.2' of git://github.com/mayflower/nixpkgs 2016-01-07 14:37:50 -05:00
Shea Levy 025770fdd9 Merge branch 'pkg/netatop-0.7' of git://github.com/mayflower/nixpkgs 2016-01-07 14:36:51 -05:00
Lluís Batlle i Rossell be9ad574f7 Adding framebuffer console rotation to kernels.
This helps in some weird screens that otherwise show the console 90° turned.
2016-01-07 16:48:46 +01:00
Franz Pletz 7f144d8f09 batman-adv: 2014.4.0 -> 2015.2 2016-01-07 16:25:46 +01:00
Franz Pletz bcd31489a1 netatop: 0.3 -> 0.7 2016-01-07 16:25:02 +01:00
Eelco Dolstra e4b4e9b986 linux: Make Unix domain sockets builtin
This hopefully fixes intermittent initrd failures where udevd cannot
create a Unix domain socket:

  machine# running udev...
  machine# error getting socket: Address family not supported by protocol
  machine# error initializing udev control socket
  machine# error getting socket: Address family not supported by protocol

The "unix" kernel module is supposed to be loaded automatically, and
clearly that works most of the time, but maybe there is a race
somewhere. In any case, no sane person would run a kernel without Unix
domain sockets, so we may as well make it builtin.

http://hydra.nixos.org/build/30001448
2016-01-07 13:20:53 +01:00
Michael Alan Dorman fe00c8a83f Revert "iptables: 1.4.21 -> 1.6.0"
This reverts commit b2ac241e95, which
upgraded iptables, because it causes connmand to segfault on my machine:

    Jan 05 22:02:06 aching connmand[7866]: Connection Manager version 1.30
    Jan 05 22:02:06 aching audit: NETFILTER_CFG table=filter family=2 entries=27
    Jan 05 22:02:06 aching audit[7866]: SYSCALL arch=c000003e syscall=54 success=yes exit=0 a0=a a1=0 a2=40 a3=103a5b0 items=0 ppid=1 pid=7866 auid=4294967295 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=(none) ses=4294967295 comm="connmand" exe="/nix/store/x7lyis4srvd68lflgnqqmg2bc1fm2whb-connman-1.30/bin/connmand" key=(null)
    Jan 05 22:02:06 aching audit: PROCTITLE proctitle=2F6E69782F73746F72652F78376C796973347372766436386C666C676E71716D6732626331666D327768622D636F6E6E6D616E2D312E33302F7362696E2F636F6E6E6D616E64002D2D636F6E6669673D2F6E69782F73746F72652F37383078797137726367376766306271706A3130306C666238336B69367938762D636F6E6E
    Jan 05 22:02:06 aching audit: NETFILTER_CFG table=mangle family=2 entries=6
    Jan 05 22:02:06 aching audit[7866]: SYSCALL arch=c000003e syscall=54 success=yes exit=0 a0=a a1=0 a2=40 a3=1038c00 items=0 ppid=1 pid=7866 auid=4294967295 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=(none) ses=4294967295 comm="connmand" exe="/nix/store/x7lyis4srvd68lflgnqqmg2bc1fm2whb-connman-1.30/bin/connmand" key=(null)
    Jan 05 22:02:06 aching audit: PROCTITLE proctitle=2F6E69782F73746F72652F78376C796973347372766436386C666C676E71716D6732626331666D327768622D636F6E6E6D616E2D312E33302F7362696E2F636F6E6E6D616E64002D2D636F6E6669673D2F6E69782F73746F72652F37383078797137726367376766306271706A3130306C666238336B69367938762D636F6E6E
    Jan 05 22:02:06 aching audit: NETFILTER_CFG table=nat family=2 entries=5
    Jan 05 22:02:06 aching audit[7866]: SYSCALL arch=c000003e syscall=54 success=yes exit=0 a0=a a1=0 a2=40 a3=1037800 items=0 ppid=1 pid=7866 auid=4294967295 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=(none) ses=4294967295 comm="connmand" exe="/nix/store/x7lyis4srvd68lflgnqqmg2bc1fm2whb-connman-1.30/bin/connmand" key=(null)
    Jan 05 22:02:06 aching audit: PROCTITLE proctitle=2F6E69782F73746F72652F78376C796973347372766436386C666C676E71716D6732626331666D327768622D636F6E6E6D616E2D312E33302F7362696E2F636F6E6E6D616E64002D2D636F6E6669673D2F6E69782F73746F72652F37383078797137726367376766306271706A3130306C666238336B69367938762D636F6E6E
    Jan 05 22:02:06 aching connmand[7866]: Aborting (signal 11) [/nix/store/x7lyis4srvd68lflgnqqmg2bc1fm2whb-connman-1.30/sbin/connmand]
    Jan 05 22:02:06 aching connmand[7866]: ++++++++ backtrace ++++++++
    Jan 05 22:02:06 aching connmand[7866]: +++++++++++++++++++++++++++
    Jan 05 22:02:06 aching systemd[1]: connman.service: Main process exited, code=exited, status=1/FAILURE
    Jan 05 22:02:06 aching systemd[1]: connman.service: Unit entered failed state.
    Jan 05 22:02:06 aching systemd[1]: connman.service: Failed with result 'exit-code'.
    Jan 05 22:02:06 aching systemd[1]: connman.service: Service hold-off time over, scheduling restart.
    Jan 05 22:02:06 aching systemd[1]: Stopped Connection service.

Arrived at through bisection, verified using this commit.
2016-01-06 06:24:42 -05:00
Tobias Geerinckx-Rice 9f2a7bf862 mcelog: 128 -> 129
Add support to decode MSCOD values for Broadwell-{de,ep,ex}.
2016-01-05 20:22:35 +01:00
Eelco Dolstra 49f46d58bb Merge pull request #12160 from obadz/syscall_limiter
syscall_limiter: init at b02c03
2016-01-05 16:52:02 +01:00
obadz f5b087b94e syscall_limiter: init at b02c031 2016-01-05 15:37:17 +00:00
Bjørn Forsman 38d115bc71 guvcview: add pulseaudioSupport option (default true) 2016-01-05 11:54:47 +01:00
Bjørn Forsman e753f795e2 guvcview: 1.7.2 -> 2.0.2
* Download tarball instead of git repo, drop autoreconfHook.
* The application now needs SDL2 instead of SDL.
* The build failed without 'gsl', so add that. (I think ./configure can
  be told to build without it, but it's only 5.7 MiB.)
2016-01-05 11:54:46 +01:00
Tim Steinbach 1283e01b38 linux-testing: 4.4.0-rc7 -> 4.4.0-rc8 2016-01-04 20:52:19 +00:00
Tobias Geerinckx-Rice 5606e8b043 uksmtools: add 1-line comment to clarify fetchgit use... 2016-01-04 04:07:33 +01:00
Pascal Wittmann 1d2bb7ddfc Merge pull request #12111 from dezgeg/pr-i2ctools-source
i2c-tools: Fetch source from debian
2016-01-03 19:37:05 +01:00
Tuomas Tynkkynen a9b83b5643 i2c-tools: Fetch source from debian
lm-sensors.org has been down for a while now.
2016-01-03 19:34:37 +02:00
aszlig 7ea34af4dd
linux-testing: 4.4.0-rc6 -> 4.4.0-rc7
Upstream changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=v4.4-rc7

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-02 17:56:03 +01:00
leenaars 3bd03f3141 xf86-input-wacom: 0.31.0 -> 0.32.0 2016-01-01 14:16:32 +01:00
Michael Raskin b2ac241e95 iptables: 1.4.21 -> 1.6.0 2016-01-01 12:30:17 +03:00
Michael Raskin 0f9a361064 firejail: 0.9.26 -> 0.9.36 2016-01-01 12:30:17 +03:00
Michael Raskin 5db11e97e7 conspy: 1.10 -> 1.13 2016-01-01 12:30:17 +03:00
Michael Raskin df9efd4f1b sysdig: 0.5.1 -> 0.6.0 2016-01-01 12:30:17 +03:00
Vladimír Čunát 08dd527cc7 Merge branch 'staging'
http://hydra.nixos.org/eval/1234895
The mass errors on Hydra seem transient; I verified ghc on i686-linux.
Only darwin jobs are queued ATM. There's a libpng security update
included in this merge, so I don't want to wait too long.
2015-12-29 17:14:35 +01:00
Eelco Dolstra f6df6d8d46 linux: 3.18.24 -> 3.18.25 2015-12-29 15:56:20 +01:00
Bjørn Forsman 4f3d769d6f conky: add meta.platforms 2015-12-29 13:16:01 +01:00
Tobias Geerinckx-Rice 330b89c68b crda: use PREFIX instead of DESTDIR
Otherwise, `$out/lib/udev/rules.d/85-regulatory.rules` will still refer to a
non-existent `/sbin/crda`.
2015-12-27 21:43:26 +01:00
Tobias Geerinckx-Rice ee0fae473c crda: init at 3.18 2015-12-27 19:00:42 +01:00
Robin Gloster 501d49ebc4 wpa_supplicant: add patch to build with libressl 2.3 2015-12-23 22:08:33 +00:00
Profpatsch b336e1b24a alsa-utils: fix alsa-info.sh 2015-12-22 19:51:55 +01:00
Nikolay Amiantov 0d7c0efa7d udisks2: fix udev rules file (close #11743)
This properly hides system partitions (like EFI or Windows recovery) from UDisks.
2015-12-22 08:09:34 +01:00
Rok Garbas 38a6b5fb43 Merge pull request #11683 from rvl/fail2ban
Make fail2ban work again
2015-12-22 01:46:18 +01:00
aszlig a326ab1755
linux-testing: 4.4.0-rc5 -> 4.4.0-rc6
Upstream changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=v4.4-rc6

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-21 17:16:49 +01:00
Eelco Dolstra b60f0fdcd4 systemd: Apply upstream fix: networkd: link - do not drop config for loopback device 2015-12-18 18:02:16 +01:00
Rodney Lorrimar 2eb8c3e491 systemd: python module split out since v223 2015-12-18 09:44:22 +00:00
Tobias Geerinckx-Rice 1e3314718d uksmtools: init at 2015-09-25 2015-12-17 23:51:43 +01:00
Nikolay Amiantov 07eb0ad76c phc-intel: fix installation dir 2015-12-17 16:49:11 +03:00
Igor Pashev a911acdfb3 LXC: make sure configure script does not guess
Do not try to install init script.
And do not make any assumptions about the distribution.

The latter is important when Nix store in not a part of NixOS.

Closes #11729.
2015-12-17 10:11:39 +03:00
Domen Kožar a2f8812096 add numad: daemon that manages application locality 2015-12-15 23:41:43 +01:00
Tobias Geerinckx-Rice b566f73f38 linuxPackages.phc-intel: 0.4.0-rev{18 -> 19}
Fixes #11733.

Minimum Linux kernel version is now 4.3.x.
2015-12-15 19:18:49 +01:00
aszlig 45e335aabd
linux-testing: 4.4.0-rc4 -> 4.4.0-rc5
Upstream changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=v4.4-rc5

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-14 20:29:10 +01:00
Daniel Peebles 5caa62dea3 Merge pull request #11689 from sigma/fix/adv_cmds
adv_cmds: fix typo in file name
2015-12-14 09:40:03 -05:00
Arseniy Seroka fcf88282f9 Merge pull request #11549 from jgillich/syslinux
syslinux: fix missing mtools dependency
2015-12-14 13:21:31 +03:00
Yann Hodique 000fe58769 adv_cmds: fix typo in file name
adv_cmds archive actually contains BSDmakefile, not BSDMakefile. While
that probably doesn't matter in default installations, it does matter
for case-sensitive filesystems.
2015-12-13 12:02:42 -08:00
aszlig fb37fc631a
systemd: Apply VirtualBox fix for detect-virt.
The update is basically just one additional commit, which was an
upstream cherry-pick pushed at NixOS/systemd#3 and it fixes
systemd-detect-virt with VirtualBox so that services with
ConditionVirtualization set to "oracle" will work properly.

I've tested this with the "virtualbox" NixOS VM test, which was failing
since the update to version 228.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-13 05:36:10 +01:00
Anders Papitto 229f0ac257 sysdig: 0.1.102 -> 0.5.1 2015-12-12 12:31:29 -08:00
Shea Levy 18af0f88d0 Linux 4.3: 4.3 -> 4.3.2 2015-12-12 08:46:34 -05:00
aszlig fc6d1471ce
linux-testing: Revert build fix for -rc3.
This reverts commit 79bd2b08ee.

The commit was from an upstream commit anyway and has since been applied
to mainline.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-11 11:31:05 +01:00
Eelco Dolstra 54d6f1f683 linux: 3.14.56 -> 3.14.58 2015-12-10 16:26:33 +01:00
Jakob Gillich 985bd0808e syslinux: fix missing mtools dependency
closes #11472
2015-12-09 03:17:08 +01:00
aszlig c00feace39
linux-testing: 4.4.0-rc3 -> 4.4.0-rc4
Upstream changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=v4.4-rc4

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-08 03:51:34 +01:00
Eelco Dolstra 1da87d4062 systemd: Update to 228 2015-12-07 20:25:53 +01:00
Gabriel Ebner f4c01fc004 systemd: enable timedated, hostnamed, localed. 2015-12-07 20:25:53 +01:00
Jan Malakhovski 43a1cfccf5 conky: build the docs, fixes #11461 2015-12-05 20:34:57 +01:00
Vladimír Čunát 263fd55d4b Merge recent staging built on Hydra
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
aszlig 79bd2b08ee
linux-testing: Fix build with default config.
Regression introduced by 03a3a905b9.

Our default config includes all modules and since torvalds/linux@47ca6ec
this results in a regression due to in a circular dependency between
libcfs and LNet:

depmod: ERROR: Found 2 modules in dependency cycles!
depmod: ERROR: Cycle detected: lnet -> libcfs -> lnet

The discussion regarding this in the LKML is here:

https://lkml.org/lkml/2015/11/2/388

So this adds a patch which is not yet included in mainline and has been
submitted to the LKML at:

https://lkml.org/lkml/2015/11/6/987

Built successfully via "nix-build -A linux-testing".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-01 11:22:29 +01:00
Franz Pletz 4a2b075154 jool: 3.3.2 -> 3.4.2, fixes #11299 2015-12-01 10:49:44 +01:00
aszlig 03a3a905b9
linux-testing: 4.4.0-rc1 -> 4.4.0-rc3
Upstream changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=v4.4-rc1&id2=v4.4-rc3

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-01 09:34:39 +01:00