[linux] 02/02: 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 a843bf5bb336c0756a16425695719b0a1b6d12e3
Merge: ad62774 2502943
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Jun 1 14:10:48 2017 +0100

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

 debian/changelog                                                    | 6 ++++--
 ...ks.patch => crypto-skcipher-Add-missing-api-setkey-checks.patch} | 0
 debian/patches/series                                               | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 711829d,9757cfe..bc6a1a7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -408,14 -408,14 +408,16 @@@ linux (4.9.30-1) UNRELEASED; urgency=me
    * Ignore ABI changes in ccp and hid-sensors
    * [mips*el/loongson-3] Revert "MIPS: Loongson-3: Select
      MIPS_L1_CACHE_SHIFT_6" to avoid ABI change
++  * SUNRPC: Refactor svc_set_num_threads()
++  * NFSv4: Fix callback server shutdown (CVE-2017-9059)
+ 
+   [ Salvatore Bonaccorso ]
    * tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline()
      (CVE-2017-0605)
    * dccp/tcp: do not inherit mc_list from parent (CVE-2017-8890)
-   * SUNRPC: Refactor svc_set_num_threads()
-   * NFSv4: Fix callback server shutdown (CVE-2017-9059)
    * ipv6: Prevent overrun when parsing v6 header options (CVE-2017-9074)
    * sctp: do not inherit ipv6_{mc|ac|fl}_list from parent (CVE-2017-9075)
 -  * ipv6/dccp: do not inherit ipv6_mc_list from parent (CVE-2017-9076
 +  * ipv6/dccp: do not inherit ipv6_mc_list from parent (CVE-2017-9076,
      CVE-2017-9077)
    * crypto: skcipher - Add missing API setkey checks (CVE-2017-9211)
    * ipv6: fix out of bound writes in __ip6_append_data() (CVE-2017-9242)

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