Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e41069a9892c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1d651d134030
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 14, 2019

  1. linux: remove deprecated kernel config options 

    Our oldest kernel is 4.4. That's why we can remove configurations that only
applies to kernels older than that.
    @Mic92
    Mic92 committed Oct 14, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    makefu Felix Richter
    GPG key ID: 36F7711F3FC0F225
    Verified
    Learn about vigilant mode
    Copy the full SHA
    14a6713 View commit details

Commits on Oct 15, 2019

  1. Merge pull request #71111 from Mic92/linux-cleanup 

    linux: remove deprecated kernel config options
    @globin
    globin authored Oct 15, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    makefu Felix Richter
    GPG key ID: 36F7711F3FC0F225
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1d651d1 View commit details
Showing with 1 addition and 9 deletions.
  1. +1 −9 pkgs/os-specific/linux/kernel/common-config.nix
10 changes: 1 addition & 9 deletions pkgs/os-specific/linux/kernel/common-config.nix
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,6 @@ let
DYNAMIC_DEBUG = yes;
TIMER_STATS = whenOlder "4.11" yes;
DEBUG_NX_TEST = whenOlder "4.11" no;
CPU_NOTIFIER_ERROR_INJECT = whenOlder "4.4" (option no);
DEBUG_STACK_USAGE = no;
DEBUG_STACKOVERFLOW = mkIf (!features.grsecurity) no;
RCU_TORTURE_TEST = no;
@@ -194,8 +193,6 @@ let
};

video = {
# Enable KMS for devices whose X.org driver supports it
DRM_I915_KMS = whenOlder "4.3" yes;
# Allow specifying custom EDID on the kernel command line
DRM_LOAD_EDID_FIRMWARE = yes;
VGA_SWITCHEROO = yes; # Hybrid graphics support
@@ -264,7 +261,6 @@ let
EXT2_FS_XATTR = yes;
EXT2_FS_POSIX_ACL = yes;
EXT2_FS_SECURITY = yes;
EXT2_FS_XIP = whenOlder "4.0" yes; # Ext2 execute in place support

EXT3_FS_POSIX_ACL = yes;
EXT3_FS_SECURITY = yes;
@@ -366,10 +362,6 @@ let
MICROCODE = yes;
MICROCODE_INTEL = yes;
MICROCODE_AMD = yes;

MICROCODE_EARLY = whenOlder "4.4" yes;
MICROCODE_INTEL_EARLY = whenOlder "4.4" yes;
MICROCODE_AMD_EARLY = whenOlder "4.4" yes;
} // optionalAttrs (versionAtLeast version "4.10") {
# Write Back Throttling
# https://lwn.net/Articles/682582/
@@ -714,7 +706,7 @@ let

PREEMPT = no;
PREEMPT_VOLUNTARY = yes;

X86_AMD_PLATFORM_DEVICE = yes;

} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {