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

Sat Jan 28 22:48:51 UTC 2017

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

benh pushed a commit to branch sid
in repository linux.

commit 855efa4b7bd581587918bb2166a11adff2b6e070
Merge: e09f27e 7026519
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Jan 28 22:48:16 2017 +0000

    Merge remote-tracking branch 'alioth/sid' into sid
    
    Bump the changelog version (again) for the unreleased changes.

 debian/abi/4.9.0-1/amd64_none_amd64                | 18769 -------------------
 debian/abi/4.9.0-1/amd64_rt_amd64                  | 18724 ------------------
 debian/abi/4.9.0-1/arm64_none_arm64                | 16321 ----------------
 debian/abi/4.9.0-1/armel_none_marvell              | 13871 --------------
 debian/abi/4.9.0-1/armhf_none_armmp                | 16571 ----------------
 debian/abi/4.9.0-1/armhf_none_armmp-lpae           | 16686 -----------------
 debian/abi/4.9.0-1/i386_none_686                   | 18551 ------------------
 debian/abi/4.9.0-1/i386_none_686-pae               | 18642 ------------------
 debian/abi/4.9.0-1/i386_rt_686-pae                 | 18600 ------------------
 debian/abi/4.9.0-1/m68k_none_m68k                  |  7504 --------
 debian/abi/4.9.0-1/mips64el_none_5kc-malta         | 14491 --------------
 debian/abi/4.9.0-1/mips64el_none_loongson-3        | 14187 --------------
 debian/abi/4.9.0-1/mips64el_none_octeon            | 13441 -------------
 debian/abi/4.9.0-1/mips_none_4kc-malta             | 14462 --------------
 debian/abi/4.9.0-1/mips_none_5kc-malta             | 14494 --------------
 debian/abi/4.9.0-1/mips_none_octeon                | 13444 -------------
 debian/abi/4.9.0-1/mipsel_none_4kc-malta           | 14459 --------------
 debian/abi/4.9.0-1/mipsel_none_5kc-malta           | 14491 --------------
 debian/abi/4.9.0-1/mipsel_none_loongson-3          | 14187 --------------
 debian/abi/4.9.0-1/mipsel_none_octeon              | 13441 -------------
 debian/abi/4.9.0-1/powerpc_none_powerpc            | 15250 ---------------
 debian/abi/4.9.0-1/powerpc_none_powerpc-smp        | 15397 ---------------
 debian/abi/4.9.0-1/powerpc_none_powerpc64          | 16074 ----------------
 debian/abi/4.9.0-1/powerpcspe_none_powerpcspe      | 15158 ---------------
 debian/abi/4.9.0-1/ppc64_none_powerpc64            | 16034 ----------------
 debian/abi/4.9.0-1/ppc64el_none_powerpc64le        | 15711 ----------------
 debian/abi/4.9.0-1/s390x_none_s390x                | 12261 ------------
 debian/abi/4.9.0-1/sparc64_none_sparc64            | 13843 --------------
 debian/abi/4.9.0-1/sparc64_none_sparc64-smp        | 13983 --------------
 debian/changelog                                   |    13 +
 debian/config/arm64/config                         |     1 +
 debian/config/armhf/config                         |     3 -
 debian/config/config                               |    31 +
 debian/config/defines                              |     3 +-
 debian/config/kernelarch-mips/config.octeon        |     2 +
 debian/config/m68k/config                          |     3 +-
 debian/config/or1k/defines                         |     4 -
 .../arm64-ptrace-avoid-abi-change-in-4.9.6.patch   |    23 -
 .../cfg80211-avoid-abi-change-in-4.9.3.patch       |    23 -
 .../debian/memcg-avoid-abi-change-in-4.9.5.patch   |    25 -
 .../debian/power-avoid-abi-change-in-4.9.3.patch   |    28 -
 debian/patches/series                              |     4 -
 42 files changed, 50 insertions(+), 439160 deletions(-)

diff --cc debian/changelog
index 6ff0ea2,a61f990..ff3cdf0

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
 -linux (4.9.6-3) UNRELEASED; urgency=medium
++linux (4.9.6-4) UNRELEASED; urgency=medium
+ 
+   * Bump ABI to 2
+   * [or1k] Remove configuration, as the port has been abandoned
+   * [arm64] Enable KEXEC (Closes: #852747)
+   * [arm64,armhf,x86] usb: gadget: Enable USB_CONFIGFS, USB_ETH, USB_GADGETFS,
+     USB_FUNCTIONFS, USB_G_SERIAL as modules;
+     USB_CONFIGFS_{SERIAL,ACM,OBEX,NCM,ECM,ECM_SUBSET,RNDIS,EEM,PHONET,MASS_STORAGE},
+     USB_CONFIGFS_F_{LB_SS,LS,UAC1,UAC2,MIDI,HID,UVC,PRINTER}, USB_ETH_RNDIS,
+     USB_FUNCTIONFS_{ETH,RNDIS,GENERIC} (thanks to Riku Voipio)
+ 
+  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 27 Jan 2017 18:14:31 +0000
+ 
 +linux (4.9.6-3) unstable; urgency=medium
 +
 +  * btree,musb,st_sensors: Ignore ABI changes (fixes FTBFS on armel,armhf)
 +
 + -- Ben Hutchings <ben at decadent.org.uk>  Sat, 28 Jan 2017 16:11:16 +0000
 +
  linux (4.9.6-2) unstable; urgency=medium
  
    * linux-cpupower: Use dh-exec architecture filtering for x86-specific files
diff --cc debian/config/defines
index 536da69,55048d1..75e88b5
--- a/debian/config/defines
+++ b/debian/config/defines
@@@ -1,8 -1,7 +1,8 @@@
  [abi]
- abiname: 1
+ abiname: 2
  ignore-changes:
   __cpuhp_*
 + module:drivers/iio/common/st_sensors/**
   module:drivers/net/wireless/**
   module:drivers/power/supply/bq27xxx_battery
   module:drivers/usb/host/**

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

