Merge remote-tracking branch 'upstream/master' into HEAD

2017-10-07 12:15:17 +02:00
parent 55ed948a55 a9e090f749
commit acfec163b1
22 changed files with 1285 additions and 1289 deletions
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -245,6 +245,9 @@ with stdenv.lib;
  USB_SERIAL_KEYSPAN_USA49W y
  USB_SERIAL_KEYSPAN_USA49WLC y

+  # Device mapper (RAID, LVM, etc.)
+  MD y
+
  # Filesystem options - in particular, enable extended attributes and
  # ACLs for all filesystems that support them.
  FANOTIFY y