[linux] 05/05: Merge remote-tracking branch 'alioth/sid' into sid

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 6ef03e0be7b9e2cbe215fc2ea47c53759ff43931
Merge: b80acec 23fadf4
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Apr 16 17:22:54 2017 +0100

    Merge remote-tracking branch 'alioth/sid' into sid

 debian/changelog                                   |  3 +
 ...y.c-fix-error-handling-in-set_mempolicy-a.patch | 76 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 80 insertions(+)

diff --cc debian/changelog
index f244324,1334a78..adcecfa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -14,10 -14,8 +14,11 @@@ linux (4.9.18-2) UNRELEASED; urgency=me
      (Closes: #859978)
    * udeb: Include all AHCI drivers in sata-modules (Closes: #860335)
    * [powerpc/powerpc64,ppc64] Set NR_CPUS=2048, matching ppc64el
 -  * [arm64] Explicitly set NR_CPUS=64
 +  * [powerpc*/*64*] Enable CPUMASK_OFFSTACK to reduce stack usage
 +  * [mips*el/loongson-3] Set NR_CPUS=16 to allow for Loongson 3B2000
 +  * [mips*/octeon] Set NR_CPUS=64 to allow for Cavium CN7890
 +  * [arm64] Set NR_CPUS=256 to allow for multi-SoC systems
+   * [powerpc/powerpc-smp,powerpcspe] Explicitly set NR_CPUS=4
  
    [ Salvatore Bonaccorso ]
    * ping: implement proper locking (CVE-2017-2671)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git