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
base: e037231f7655
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a4e1e9cbd761
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 27, 2018

  1. Disable fortify and stackprotector hardening for spl/zfs.

    Linux 4.16 introduces a stackprotector detection script that returns
    different results for the kernel compilation run and the spl/zfs
    compilation run, as the setting for hardening are different. This
    results in a broken ABI between spl/zfs and the compiled kernel,
    breaking ZFS. Also disabling the fortify and stackprotector hardening,
    as we do for the kernel, fixes that.
    
    (cherry picked from commit 43a737b)
    clefru committed Jun 27, 2018
    Copy the full SHA
    ee2fab6 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #42654 from clefru/zfs-cherry

    Disable fortify and stackprotector hardening for spl/zfs.
    Mic92 committed Jun 27, 2018
    Copy the full SHA
    a4e1e9c View commit details
    Browse the repository at this point in the history