[linux] 13/13: Merge remote-tracking branch 'alioth/rosh/strip_armel'

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux.

commit 66d8e083d56cda2369f98554cd81e56cac2a46b5
Merge: 0134b5c d7f8738
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Aug 12 23:08:28 2017 +0100

    Merge remote-tracking branch 'alioth/rosh/strip_armel'
    
    Note Roger's changes in changelog.

 debian/changelog                                         |  3 +++
 debian/config/armel/config.marvell                       | 12 ++++++------
 debian/installer/armel/modules/armel-marvell/mtd-modules |  5 +++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 73832c5,218bd1c..01aa0c5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -29,32 -22,7 +29,35 @@@ linux (4.12.6-1) UNRELEASED; urgency=me
    * [i386] perf tools: Fix unwind build (fixes FTBFS)
    * debian/control: Fix version in dependencies on arch-independent
      linux-headers-*-common* (Closes: #869511)
 +  * xfrm: policy: check policy direction value (CVE-2017-11600)
 +  * rtlwifi: Fix memory leak when firmware request fails
 +  * rtlwifi: Fix fallback firmware loading (Closes: #869084)
 +  * [arm64] video: Enable FRAMEBUFFER_CONSOLE (Closes: #870071)
 +  * integrity: Enable INTEGRITY_SIGNATURE, INTEGRITY_ASYMMETRIC_KEYS
 +    (Closes: #869565)
 +  * [x86] sound: Enable SND_X86; enable HDMI_LPE_AUDIO as module
 +    (Closes: #869372)
 +  * blk-mq: Change MQ_IOSCHED_KYBER from built-in to module
 +  * blk-mq: Enable IOSCHED_BFQ as module (Closes: #869028); enable
 +    BFQ_GROUP_IOSCHED
 +  * bfq: Enable auto-loading when built as a module
 +  * netfilter: Enable NFT_FIB_IPV4, NFT_FIB_IPV6, NFT_FIB_INET as modules
 +    (Closes: #868803)
 +  * [amd64,arm64] mm: Revert x86_64 and arm64 ELF_ET_DYN_BASE base
 +    (Closes: #869090)
 +
 +  [ Salvatore Bonaccorso ]
 +  * packet: fix tp_reserve race in packet_set_ring (CVE-2017-1000111)
 +  * udp: consistently apply ufo or fragmentation (CVE-2017-1000112)
 +  * Set ABI to 1
 +
 +  [ Uwe Kleine-König ]
 +  * [arm64] enable MMC_SDHCI_XENON and MVNETA for Espressobin and enable
 +    respective device in its device tree (Closes: #871049)
 +
++  [ Roger Shimizu ]
++  * [armel] Change NAND related stuff to modules (fixes FTBFS)
+ 
   -- Ben Hutchings <ben at decadent.org.uk>  Tue, 18 Jul 2017 13:26:41 +0100
  
  linux (4.12.2-1~exp1) experimental; urgency=medium

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