Commit Graph

4718 Commits

Author SHA1 Message Date
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
Tobias Geerinckx-Rice
ea8c69039e freefall 4.2 -> 4.3 2015-11-26 23:45:31 +01:00
Tobias Geerinckx-Rice
2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Arseniy Seroka
e568fe9cef udisks: add missing patch 2015-11-26 18:46:08 +03:00
Arseniy Seroka
1af969f8f3 udisks: apply patch to work with new glibc 2015-11-26 18:45:20 +03:00
Pascal Wittmann
6d25c0f1b3 Remove unneeded 'with's from meta.platforms 2015-11-25 23:06:09 +01:00
Jude Taylor
d539d9c935 revert to __impureHostDeps where possible 2015-11-25 10:09:35 -08:00
Tobias Geerinckx-Rice
373da3b815 radeontop 2015-08-06 -> 2015-11-24 2015-11-24 19:28:49 +01:00
Joachim Fasting
b3144ea287 directvnc: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Joachim Fasting
9d7c387d26 untie: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Jude Taylor
32cb70bb07 propagate nothing for Kernel.framework since it exposes no library 2015-11-21 15:59:43 -08:00
Jude Taylor
4cd86cb068 in cf-private, use correct path to CoreFoundation 2015-11-21 15:55:19 -08:00
Jude Taylor
f5609a4d2a reintroduce impure host deps to all derivations 2015-11-21 15:51:48 -08:00
Jude Taylor
69e7f3bb74 switch to zero underscores for sandbox profiles; remove generateFrameworkProfile 2015-11-21 12:10:33 -08:00
Jude Taylor
a63346e33c use single underscore for sandboxProfile 2015-11-21 11:17:30 -08:00
Jude Taylor
df80090d09 use per-derivation sandbox profiles 2015-11-19 11:31:06 -08:00
Jude Taylor
914e9baefe start on sandbox stuff 2015-11-19 11:31:06 -08:00
Eelco Dolstra
16acdb45bd Revert "kernel: Remove unsupported 3.10, 3.12, 3.14"
This reverts commit 2441e002e2. The
motivation for removing them was not very convincing. Also, we need
3.14 on some Hydra build machines.
2015-11-19 14:25:16 +01:00
Domen Kožar
648265e020 Merge pull request #11111 from davidrusu/master
update net-tools home page
2015-11-18 08:31:02 +01:00
David Rusu
c46ffb05ff update net-tools home page
Previous domain had expired
2015-11-18 00:35:28 -05:00
William A. Kennington III
8d01a4a4e4 nvidia: 352.55 -> 352.63 2015-11-17 21:13:41 -08:00
William A. Kennington III
893179e9c1 linux-testing: Bump to 4.4-rc1 2015-11-17 17:21:25 -08:00
Pascal Wittmann
7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
aszlig
880eba6481
conky: Fix building with CMake 3.4.0.
Regression introduced by 050bebb8c4.

It's essentially an upgrade to CMake 3.4.0, which breaks the build
because it seems that in CMake 3.3.x, the check_include_files() command
was implicitly included (haven't found out about why exactly).

So we're now just adding an import for CheckIncludeFiles in addition to
CheckIncludeFile, so that we have both commands (the plural and the
singular variant) available.

My original goal was to use brndnmtthws/conky@3a574ba, but this breaks
the build as well, because check_include_files doesn't accept additional
compile flags.

However, this is needed if building with wireless support, because
including iwlib.h needs -D_GNU_SOURCE set and check_include_files
doesn't do that.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-11-17 05:51:27 +01:00
William A. Kennington III
453f7c7218 Merge branch 'master.upstream' into staging.upstream 2015-11-14 12:39:32 -08:00
William A. Kennington III
6e18a33183 syslinux: 6.03 -> 2015-11-09 2015-11-14 12:38:56 -08:00
William A. Kennington III
4ead61ca39 Merge remote-tracking branch 'upstream/master' into master.upstream 2015-11-14 12:33:53 -08:00
William A. Kennington III
6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
Luca Bruno
fb864b8898 pommed: mark as broken, src hash changed
cc @shlevy
2015-11-14 18:57:51 +01:00
Domen Kožar
fc8562c785 udisks: add missing libgudev 2015-11-14 16:50:23 +01:00
William A. Kennington III
8f45d18a71 Merge branch 'master.upstream' into staging.upstream 2015-11-13 15:54:10 -08:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Brian McKenna
6668058a62 linux: add config options needed for a Bay Trail Chromebook
Close #10416.
Got /dev/mmcblk0 on a live CD with these options:

    X86_INTEL_LPSS y
    PINCTRL_BAYTRAIL y
2015-11-11 15:33:42 +01:00
Thomas Strobel
2ee7aaf46b miraclecast: init at 0.0-git-20151002
(cherry picked from commit 9e33e2365e)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-11-11 12:54:14 +01:00
Domen Kožar
505117f3fb Merge branch 'master' into staging 2015-11-11 12:53:36 +01:00
Desmond O. Chang
a058329a28 android-udev-rules: 20150920 -> 20151108 2015-11-11 16:45:16 +08:00
William A. Kennington III
d4661c7366 kernel: 4.1.12 -> 4.1.13 2015-11-10 16:17:09 -08:00
William A. Kennington III
3950ab9eb9 kernel: 4.2.5 -> 4.2.6 2015-11-10 16:17:06 -08:00
Eelco Dolstra
789504dadf perf: Fix libbfd dependency
This fixes C++ symbol demangling.
2015-11-10 22:12:38 +01:00
Nikolay Amiantov
d4c27381dc Merge pull request #10460 from abbradar/remote-askpass
Support network in initrd and entering LUKS passphrase via SSH
2015-11-10 16:41:34 +03:00
Arseniy Seroka
f60d710f88 Merge pull request #10894 from dezgeg/pr-trinity-update
trinity: 1.5 -> 1.6
2015-11-09 22:47:01 +03:00
William A. Kennington III
2441e002e2 kernel: Remove unsupported 3.10, 3.12, 3.14
Our base kernel headers were bumped to 3.18 so we can no longer reliably
support kernels older than 3.18
2015-11-09 11:10:42 -08:00
Tobias Geerinckx-Rice
0c55a42dfb fatrace 0.10 -> 0.11 2015-11-09 18:07:05 +01:00
Tobias Geerinckx-Rice
10df3db175 kexec-tools 2.0.10 -> 2.0.11 2015-11-09 18:03:11 +01:00
Tobias Geerinckx-Rice
ba527075af kexec-tools: add mirror://kernel URI
From http://horms.net/projects/kexec/kexec-tools:

  "The canonical site for kexec-tools release is
   http://kernel.org/pub/linux/utils/kernel/kexec/. It should also be
   available on the extensive network of kernel.org mirror sites and
   it is mirrored at http://horms.net/projects/kexec/kexec-tools/
   just for good measure."
2015-11-09 18:03:10 +01:00
Nikolay Amiantov
265718c985 x86_enegry_perf_policy: init at kernel versions 2015-11-09 17:29:48 +03:00
Tuomas Tynkkynen
291f187334 trinity: 1.5 -> 1.6
Need to fix a /usr/include reference in the new release.
2015-11-08 20:09:17 +02:00
William A. Kennington III
5149c03adc Merge branch 'master.upstream' into staging.upstream 2015-11-07 18:53:26 -08:00
William A. Kennington III
64e262dd91 util-linux: 2.27 -> 2.27.1 2015-11-07 18:51:07 -08:00
William A. Kennington III
37a5b16588 ipset: 6.26 -> 6.27 2015-11-07 16:28:14 -08:00
William A. Kennington III
a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
William A. Kennington III
d33c63c19d kernel: 3.12.49 -> 3.12.50 2015-11-07 15:44:53 -08:00
Domen Kožar
07405ee187 Merge pull request #9463 from khumba/nm-connection-sharing
Fix NetworkManager connection sharing
2015-11-06 11:16:50 +01:00
William A. Kennington III
1e7aa4f17d Merge branch 'master.upstream' into staging.upstream 2015-11-05 18:30:11 -08:00
William A. Kennington III
7cd13a21af cryptsetup: 1.6.7 -> 1.7.0 2015-11-05 18:21:43 -08:00
William A. Kennington III
168220741d bluez5: 5.35 -> 5.36 2015-11-05 18:21:43 -08:00
William A. Kennington III
2837a5e091 Merge branch 'master.upstream' into staging.upstream 2015-11-05 10:07:28 -08:00
Jude Taylor
7161be03c4 add libutil into darwin.Libsystem 2015-11-04 10:49:19 -08:00
Eelco Dolstra
3e44182487 Merge remote-tracking branch 'origin/systemd-219' into staging 2015-11-04 15:37:28 +01:00
Eelco Dolstra
827adff712 linux: Update to 3.18.24 2015-11-04 13:22:22 +01:00
William A. Kennington III
4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
William A. Kennington III
0bb3e0b325 iproute: 4.2.0 -> 4.3.0 2015-11-04 00:58:28 -08:00
Jude Taylor
74c99a9600 remove _main from CoreFoundation 2015-11-03 02:12:58 -08:00
William A. Kennington III
4b7f374b7d linux: Add 4.3 2015-11-02 11:01:17 -08:00
William A. Kennington III
f6361bc096 zfs: 0.6.5.2 -> 0.6.5.3 2015-11-02 11:01:17 -08:00
William A. Kennington III
e57217d874 spl: 0.6.5.2 -> 0.6.5.3 2015-11-02 11:01:17 -08:00
Robin Gloster
4ebfd41fa7 lxc: 1.1.3 -> 1.1.4 (security)
fixes CVE-2015-1335
2015-11-01 12:16:33 +00:00
William A. Kennington III
ea49c910a5 kernel: 3.18.22 -> 3.18.23 2015-10-30 17:17:14 -07:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
William A. Kennington III
a7d573f224 kernel: 3.18.22 -> 3.18.23 2015-10-30 16:08:13 -07:00
Shea Levy
3c14c32975 Really disable the firmware loader user helper fallback 2015-10-30 13:31:51 -04:00
Eelco Dolstra
81f6c62004 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-30 15:47:37 +01:00
Shea Levy
a7157fa2f0 Remove firmware loader fallback.
Systemd dropped support in 207 (would be nice if configure failed with a bad flag),
so all this does is add an annoying delay if firmware can't be found by the kernel
2015-10-30 10:29:56 -04:00
Eelco Dolstra
db19779965 nvidia-x11: Update to 352.55 2015-10-30 11:06:36 +01:00
Jude Taylor
ce4f1098ca reduce security setup hook duplication 2015-10-29 13:56:02 -07:00
Henry Till
3374d9f90d htop: fix on darwin 2015-10-29 00:40:30 -07:00
Jude Taylor
3b2b2ab046 wxmac: clean up and provide with stub packages 2015-10-28 17:36:20 -07:00
Jude Taylor
b3898c586a remove duplicate Kernel 2015-10-28 17:15:40 -07:00
Jude Taylor
74416dc40a wxmac: fix build 2015-10-28 17:15:16 -07:00
Henry Till
a7784cafa3 SDL: fix on darwin 2015-10-28 19:44:30 -04:00
Jude Taylor
de0182ee59 vim: clean up arguments list 2015-10-28 13:40:10 -07:00
Jude Taylor
5207f6b45c clean up emacs framework dependencies 2015-10-28 13:34:53 -07:00
Jude Taylor
62ac96fdca add ForceFeedback impure-deps 2015-10-28 13:34:53 -07:00
Jude Taylor
c62cf0b5b3 add propagated builds where needed to darwin frameworks 2015-10-28 13:34:53 -07:00
Jude Taylor
31fa564076 libunwind is included in libSystem; disable build, copy headers only 2015-10-28 13:34:53 -07:00
Jude Taylor
33db336914 add more needed headers to cf-private 2015-10-28 13:34:53 -07:00
Jude Taylor
6eaf7d318e build libunwind for real 2015-10-28 13:34:53 -07:00
aszlig
c82060df9f
linux-testing: 4.3.0-rc5 -> 4.3.0-rc7
Upstream changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=v4.3-rc7&id2=v4.3-rc5

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-28 13:59:56 +01:00
Eelco Dolstra
d2918797bb linux: Fix i686 build 2015-10-28 11:09:59 +01:00
William A. Kennington III
221a970e82 kernel: 4.2.3 -> 4.2.5 2015-10-27 23:07:42 -07:00
William A. Kennington III
658d7b285b kernel: 4.1.11 -> 4.1.12 2015-10-27 23:07:33 -07:00
William A. Kennington III
850fff4448 kernel: 3.14.54 -> 3.14.56 2015-10-27 23:07:17 -07:00
William A. Kennington III
4eaa66c9d2 kernel: 3.10.90 -> 3.10.92 2015-10-27 23:07:09 -07:00
Jude Taylor
5ea8770263 cf-private: prepend self to system includes 2015-10-26 17:13:29 -07:00
Jude Taylor
0a23e412b4 in darwin sdk, copy headers rather than linking them 2015-10-26 17:13:29 -07:00
Arseniy Seroka
12277d2a38 Merge pull request #10503 from cleverca22/master
open-iscsi: save the staticly linked binary in its own output for use in the initrd
2015-10-27 00:57:29 +03:00
Eelco Dolstra
52c9e4415b linux: Support x2APIC
Without this, certain servers with lots of CPU cores would show only
one core.
2015-10-26 16:20:02 +01:00
Eelco Dolstra
50ab972b5a linux: Pass through configuration file
This enables "nix-build -A linux.configfile" to get the generated
kernel config.
2015-10-26 16:20:01 +01:00
Tuomas Tynkkynen
f08693d042 syslinux: Disable parallel building
Unfortunately I lost the exact failure, but it was something starting
with 'No rule to make target: ...', which suggests missing dependencies
between generated source files.
2015-10-26 09:23:28 +01:00
Vladimír Čunát
7e6288c252 kernel: 4.1.10 -> 4.1.11, /cc #10607
Boots fine for me on 64-bit.
2015-10-26 08:34:44 +01:00
Vladimír Čunát
4e4f560c08 iputils: drop dontGzipMan, as it's not needed anymore 2015-10-25 12:22:32 +01:00
Vladimír Čunát
784f69e6ae busybox: fix minimal build with musl libc
Now we always enable large file support, as it should be cheap enough,
and avoids also problems on some filesystems #10181.

The minimal build disables (almost) all options, so it was building
without large file support. However, in musl the `off_t` is *always*
64-bit, which lead to problems, now detected during build time.
2015-10-25 10:20:08 +01:00
Jude Taylor
3ff552fabe libdispatch: add os private header 2015-10-23 10:34:17 -07:00
Vladimír Čunát
4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Jude Taylor
657b1ccc47 darwin: repair QuartzCore paths 2015-10-22 09:47:20 -07:00
michael bishop
95e3c4f51c open-iscsi: save the staticly linked binary in its own output for use in the initrd 2015-10-21 00:59:21 -03:00
Nikolay Amiantov
1c48e74a33 Merge pull request #8299 from abbradar/steam-native
Steam: use native NixOS libraries instead of Steam Runtime
2015-10-20 17:07:29 +03:00
Nikolay Amiantov
4f3a99d21d pam_pgsql: init at 0.7.3.2 2015-10-19 13:30:28 +03:00
William A. Kennington III
d03661b606 linuxFirmware: 2015-09-07 -> 2015-10-18 2015-10-18 17:23:51 -07:00
Nikolay Amiantov
e7684e34ec mkinitcpio-nfs-utils: init at 0.3 2015-10-18 18:37:52 +03:00
Jude Taylor
a7f09b201e fix filepaths for darwin.security_tool 2015-10-15 20:49:29 -07:00
Charles Strahan
b1edc7909a powertop: fix --auto-tune
See https://lists.01.org/pipermail/powertop/2014-December/001727.html
2015-10-15 14:27:09 -04:00
William A. Kennington III
194357ad20 grsecurityUnstable: 4.1.7 -> 4.2.3 2015-10-15 10:41:04 -07:00
William A. Kennington III
cfb2651959 kernel: 3.12.48 -> 3.12.49 2015-10-15 10:38:01 -07:00
William A. Kennington III
8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00