[linux] 01/02: Merge branch 'sid'

Sun Jun 5 13:30:56 UTC 2016

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

benh pushed a commit to branch master
in repository linux.

commit 7569482f9b8d445988a6245ac1dfe9f586ad67d5
Merge: 8ed7991 a8fb2b9
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Jun 5 14:16:31 2016 +0100

    Merge branch 'sid'

 debian/changelog                                   |  1 +
 ...ram-and-phram-when-securelevel-is-enabled.patch | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 54 insertions(+)

diff --cc debian/changelog
index 61c4aca,7143da2..9d98060

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,109 -1,8 +1,110 @@@
 -linux (4.5.5-2) UNRELEASED; urgency=medium
 +linux (4.6-1~exp3) UNRELEASED; urgency=medium
  
 +  * [mips*r6*] Disable these architectures until dak recognises them as valid
 +    in the control file
 +  * linux-image: Rewrite maintainer scripts in shell, using the new
 +    linux-update-symlinks command (Closes: #692333, #815850).  Drop support
 +    for  minimal_swap, no_symlinks, use_hard_links and *_hook parameters in
 +    /etc/kernel-img.conf (Closes: #730073).
 +  * linux-image: postrm: Update default symlinks before running hook scripts
 +  * linux-image: Make a newly installed kernel the default if the package
 +    was previously removed
+   * mtd: Disable slram and phram when securelevel is enabled
  
 - -- Ben Hutchings <ben at decadent.org.uk>  Fri, 03 Jun 2016 00:53:44 +0100
 + -- Ben Hutchings <ben at decadent.org.uk>  Sat, 04 Jun 2016 18:33:11 +0100
 +
 +linux (4.6-1~exp2) experimental; urgency=medium
 +
 +  [ Ben Hutchings ]
 +  * [tilegx] Build a linux-libc-dev package (Closes: #824524; thanks to
 +    Helmut Grohne)
 +  * [tilegx] linux-libc-dev: Install <arch/*> headers in arch-specific
 +    directory (Closes: #823632; thanks to Helmut Grohne)
 +  * [rt] Update to 4.6-rc7-rt1 and re-enable
 +    - Override SYSTEM_TRUSTED_KEYS to work from the source_rt directory
 +  * Fold debian/config/README into debian/README.source
 +  * debian/README.source: Rewrite and expand explanation of kernel config file
 +    construction
 +  * aufs: Update support patches to aufs4.6-20160523
 +    - mmap: Fix use-after-free in remap_file_pages(2)
 +  * [mips*] Change NFS and various storage and network drivers from built-in
 +    to modules
 +  * 8139too: Use same configuration on all architectures: enable
 +    8139TOO_TUNE_TWISTER, 8139TOO_8129 and disable 8139TOO_PIO
 +  * [mipsn32{,r6}{,el}] Build linux-libc-dev and tools packages
 +  * [mips{,64}r6{,el}] Add kernel flavours for the Malta platform; build
 +    linux-libc-dev and tools packages (Closes: #825024; thanks to YunQiang Su)
 +  * [mips*/*-malta] udeb: Add ata-modules package
 +  * linux-image: Stop setting $STEM in environment for maintainer script hooks
 +  * linux-image: Add workaround for bug #817083 in debconf
 +  * linux-image: prerm: Allow removal of running kernel if we can't ask debconf
 +    questions (Closes: #825423)
 +  * linux-image: prerm: Ignore version of running kernel inside a container or
 +    chroot
 +  * [s390] udeb: Drop all packages, since s390 no longer has its own kernel
 +
 +  [ Aurelien Jarno ]
 +  * [mips64{,el}] Set CPU to MIPS64 R2.
 +  * [mips] Set CPU to MIPS32/64 R2.
 +
 +  [ Martin Michlmayr ]
 +  * [armhf] Enable more NVIDIA Tegra options (TEGRA_IOMMU_SMMU,
 +    ARM_TEGRA_DEVFREQ, SND_SOC_TEGRA_*).
 +
 + -- Ben Hutchings <ben at decadent.org.uk>  Mon, 30 May 2016 04:44:45 +0100
 +
 +linux (4.6-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release: http://kernelnewbies.org/Linux_4.6
 +
 +  [ Ben Hutchings ]
 +  * Re-apply "[media] videobuf2-v4l2: Verify planes array in buffer dequeueing",
 +    reverted upstream in 4.6
 +  * [arm64] Enable RANDOMIZE_BASE (kASLR)
 +  * [armhf] dsa: Enable NET_DSA_MV88E6123 as module, replacing
 +    NET_DSA_MV88E6123_61_65
 +
 + -- Ben Hutchings <ben at decadent.org.uk>  Tue, 17 May 2016 02:39:47 +0100
 +
 +linux (4.6~rc7-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release candidate
 +
 +  [ Ben Hutchings ]
 +  * [hppa] Enable MLONGCALLS (fixes FTBFS)
 +  * [alpha] fs: Disable BINFMT_EM86 (obsoleted by binfmt_misc; fixes FTBFS)
 +
 +  [ Aurelien Jarno ]
 +  * [mips*/octeon] Enable EDAC, EDAC_MM_EDAC, EDAC_OCTEON_L2C,
 +    EDAC_OCTEON_LMC, EDAC_OCTEON_PC, EDAC_OCTEON_PCI.
 +
 + -- Ben Hutchings <ben at decadent.org.uk>  Mon, 09 May 2016 03:39:32 +0100
 +
 +linux (4.6~rc5-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release candidate
 +
 +  [ Ben Hutchings ]
 +  * [armhf] Enable EFI, RTC_DRV_EFI
 +  * Update config for renaming/removal/replacement/merging/splitting of various
 +    symbols
 +  * *lockdep*,linux-perf: Remove '-rcN' from installation paths
 +
 +  [ Martin Michlmayr ]
 +  * [armel, armhf] Use new Marvell CESA driver.
 +  * [arm64] Enable support for NVIDIA Tegra.
 +  * [arm64] udeb: Create fb-modules.
 +
 + -- Ben Hutchings <ben at decadent.org.uk>  Fri, 29 Apr 2016 10:40:36 +0200
 +
 +linux (4.6~rc3-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release candidate
 +
 +  [ Ben Hutchings ]
 +  * aufs: Update support patches to aufs4.x-rcN-20160328
 +
 + -- Ben Hutchings <ben at decadent.org.uk>  Thu, 14 Apr 2016 23:55:15 +0100
  
  linux (4.5.5-1) unstable; urgency=medium
  

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

