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

Bump the changelog version (again) for the unreleased changes.

debian/changelog

@@ -1,3 +1,16 @@
+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@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)

debian/config/arm64/config

@@ -10,6 +10,7 @@ CONFIG_ARM64_VA_BITS_48=y
 ## end choice
 CONFIG_SCHED_MC=y
 CONFIG_SECCOMP=y
+CONFIG_KEXEC=y
 CONFIG_XEN=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MODULE_REGION_FULL=y

debian/config/armhf/config

@@ -1114,9 +1114,6 @@ CONFIG_USB_GADGET=m
 ##
 ## file: drivers/usb/gadget/legacy/Kconfig
 ##
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_GADGETFS=m
 CONFIG_USB_G_NOKIA=m
 
 ##

debian/config/config

@@ -4609,6 +4609,37 @@ CONFIG_USB_DYNAMIC_MINORS=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+
+##
+## file: drivers/usb/gadget/legacy/Kconfig
+##
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_G_SERIAL=m
 
 ##
 ## file: drivers/usb/gadget/udc/Kconfig

debian/config/defines

@@ -1,5 +1,5 @@
 [abi]
-abiname: 1
+abiname: 2
 ignore-changes:
  __cpuhp_*
  module:drivers/iio/common/st_sensors/**
@@ -35,7 +35,6 @@ arches:
 # mipsn32r6el
 # mips64r6
 # mips64r6el
- or1k
  powerpc
  powerpcspe
  ppc64

debian/config/kernelarch-mips/config.octeon

@@ -181,5 +181,7 @@ CONFIG_SPARSEMEM_MANUAL=y
 ##
 ## file: unknown
 ##
+#. octeon_mmc driver was requested in #800594, but still hasn't landed
+#. upstream.  Last submitted at: https://lkml.org/lkml/2016/12/19/185
 CONFIG_OCTEON_MMC=m
 

debian/config/m68k/config

@@ -305,7 +305,8 @@ CONFIG_SERIO_LIBPS2=y
 CONFIG_ADB=y
 CONFIG_ADB_MACII=y
 # CONFIG_ADB_MACIISI is not set
-CONFIG_ADB_IOP=y # switched on for the benefit of IIfx, Q900, Q950
+#. switched on for the benefit of IIfx, Q900, Q950
+CONFIG_ADB_IOP=y
 CONFIG_ADB_PMU68K=y
 CONFIG_ADB_CUDA=y
 CONFIG_INPUT_ADBHID=y

debian/config/or1k/defines

@@ -1,4 +0,0 @@
-[base]
-kernel-arch: openrisc
-featuresets:
-# empty; we don't have initramfs working yet

debian/patches/debian/arm64-ptrace-avoid-abi-change-in-4.9.6.patch

@@ -1,23 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Fri, 27 Jan 2017 04:53:54 +0000
-Subject: arm64: ptrace: Avoid ABI change in 4.9.6
-Forwarded: not-needed
-
-Commit aeb1f39d814b "arm64/ptrace: Avoid uninitialised struct padding
-in fpr_set()" added a new member to struct user_fpsimd_state, but it
-takes the place of what was padding (for 128-bit alignment).  Hide
-this from genksyms.
-
----
---- a/arch/arm64/include/uapi/asm/ptrace.h
-+++ b/arch/arm64/include/uapi/asm/ptrace.h
-@@ -77,7 +77,9 @@ struct user_fpsimd_state {
- 	__uint128_t	vregs[32];
- 	__u32		fpsr;
- 	__u32		fpcr;
-+#if !defined(__KERNEL__) || !defined(__GENKSYMS__)
- 	__u32		__reserved[2];
-+#endif
- };
- 
- struct user_hwdebug_state {

debian/patches/debian/cfg80211-avoid-abi-change-in-4.9.3.patch

@@ -1,23 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Mon, 23 Jan 2017 15:22:56 +0000
-Subject: cfg80211: avoid ABI change in 4.9.3
-Forwarded: not-needed
-
-enum nl80211_attrs got a new enumerator, which should be safe (it's
-meant to be extensible).  But two exported functions take it as a
-parameter type.  Hide the change from genksyms so it doesn't consider
-this to change their ABI.
-
----
---- a/include/uapi/linux/nl80211.h
-+++ b/include/uapi/linux/nl80211.h
-@@ -2339,7 +2339,9 @@ enum nl80211_attrs {
- 	NL80211_ATTR_NAN_FUNC,
- 	NL80211_ATTR_NAN_MATCH,
- 
-+#if !defined(__KERNEL__) || !defined(__GENKSYMS__)
- 	NL80211_ATTR_BSSID,
-+#endif
- 
- 	/* add attributes here, update the policy in nl80211.c */
- 

debian/patches/debian/memcg-avoid-abi-change-in-4.9.5.patch

@@ -1,25 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Mon, 23 Jan 2017 04:28:47 +0000
-Subject: memcg: Avoid ABI change in 4.9.5
-Forwarded: not-needed
-
-struct mem_cgroup_per_node was changed by commit b4536f0c829c
-"mm, memcg: fix the active list aging for lowmem requests when
-memcg is enabled", backported into 4.9.5.  This structure
-isn't used by modules, so hide the change.
-
----
---- a/include/linux/memcontrol.h
-+++ b/include/linux/memcontrol.h
-@@ -120,7 +120,11 @@ struct mem_cgroup_reclaim_iter {
-  */
- struct mem_cgroup_per_node {
- 	struct lruvec		lruvec;
-+#ifdef __GENKSYMS__
-+	unsigned long		lru_size[NR_LRU_LISTS];
-+#else
- 	unsigned long		lru_zone_size[MAX_NR_ZONES][NR_LRU_LISTS];
-+#endif
- 
- 	struct mem_cgroup_reclaim_iter	iter[DEF_PRIORITY + 1];
- 

debian/patches/debian/power-avoid-abi-change-in-4.9.3.patch

@@ -1,28 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Mon, 23 Jan 2017 14:34:01 +0000
-Subject: power: Fix ABI change in 4.9.3
-Forwarded: not-needed
-
-Commit bed570307ed7 "PM / wakeirq: Fix dedicated wakeirq for drivers
-not using autosuspend" changed struct wake_irq, but it is only used
-by built-in code and its definition is not exposed to OOT modules
-at all.  Hide the change from genksyms.
-
----
-
---- a/drivers/base/power/power.h
-+++ b/drivers/base/power/power.h
-@@ -28,8 +28,13 @@ extern void pm_runtime_remove(struct dev
- 
- struct wake_irq {
- 	struct device *dev;
-+#ifndef __GENKSYMS__
- 	unsigned int status;
-+#endif
- 	int irq;
-+#ifdef __GENKSYMS__
-+	bool dedicated_irq:1;
-+#endif
- };
- 
- extern void dev_pm_arm_wake_irq(struct wake_irq *wirq);

debian/patches/series

@@ -114,10 +114,6 @@ bugfix/powerpc/powerpc-fix-missing-crcs-add-yet-more-asm-prototypes.patch
 bugfix/all/module-disable-matching-missing-version-crc.patch
 
 # ABI maintenance
-debian/memcg-avoid-abi-change-in-4.9.5.patch
-debian/power-avoid-abi-change-in-4.9.3.patch
-debian/cfg80211-avoid-abi-change-in-4.9.3.patch
-debian/arm64-ptrace-avoid-abi-change-in-4.9.6.patch
 
 # Tools bug fixes
 bugfix/all/usbip-document-tcp-wrappers.patch