[kernel] r22857 - in dists/jessie/linux/debian: config patches patches/debian

Sun Jul 26 02:36:04 UTC 2015

Author: benh
Date: Sun Jul 26 02:36:03 2015
New Revision: 22857

Log:
Fix/ignore remaining ABI changes (I hope)

Apply two patches already present in sid.
Ignore the other two changes as they aren't likely to affect OOT modules.

Added:
   dists/jessie/linux/debian/patches/debian/revert-libata-ignore-spurious-phy-event-on-lpm-polic.patch
   dists/jessie/linux/debian/patches/debian/udp-fix-abi-change-in-3.16.7-ckt14.patch
Modified:
   dists/jessie/linux/debian/config/defines
   dists/jessie/linux/debian/patches/series

Modified: dists/jessie/linux/debian/config/defines
==============================================================================

--- dists/jessie/linux/debian/config/defines	Sat Jul 25 21:18:36 2015	(r22856)
+++ dists/jessie/linux/debian/config/defines	Sun Jul 26 02:36:03 2015	(r22857)
@@ -13,6 +13,7 @@
  module:drivers/usb/musb/*
  module:sound/i2c/other/snd-ak4113
  module:sound/i2c/other/snd-ak4114
+ module:sound/pci/emu10k1/*
  azx_alloc_cmd_io
  azx_free_cmd_io
  azx_get_response
@@ -23,6 +24,7 @@
 # Apparently not used OOT
  __add_pages
  __remove_pages
+ nf_register_queue_handler
  of_device_is_stdout_path
  module:sound/soc/*
 # Not needed by modules at all

Added: dists/jessie/linux/debian/patches/debian/revert-libata-ignore-spurious-phy-event-on-lpm-polic.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/jessie/linux/debian/patches/debian/revert-libata-ignore-spurious-phy-event-on-lpm-polic.patch	Sun Jul 26 02:36:03 2015	(r22857)
@@ -0,0 +1,83 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 15 Jun 2015 04:32:59 +0100
+Subject: [PATCH] Revert "libata: Ignore spurious PHY event on LPM policy
+ change"
+Forwarded: not-needed
+
+This reverts commit 09c5b4803a80a5451d950d6a539d2eb311dc0fb1, as
+it results in an unavoidable ABI change.
+---
+ drivers/ata/libata-core.c | 15 +--------------
+ drivers/ata/libata-eh.c   |  3 ---
+ include/linux/libata.h    |  9 ---------
+ 3 files changed, 1 insertion(+), 26 deletions(-)
+
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -6829,21 +6829,8 @@ u32 ata_wait_register(struct ata_port *a
+  */
+ bool sata_lpm_ignore_phy_events(struct ata_link *link)
+ {
+-	unsigned long lpm_timeout = link->last_lpm_change +
+-				    msecs_to_jiffies(ATA_TMOUT_SPURIOUS_PHY);
+-
+ 	/* if LPM is enabled, PHYRDY doesn't mean anything */
+-	if (link->lpm_policy > ATA_LPM_MAX_POWER)
+-		return true;
+-
+-	/* ignore the first PHY event after the LPM policy changed
+-	 * as it is might be spurious
+-	 */
+-	if ((link->flags & ATA_LFLAG_CHANGED) &&
+-	    time_before(jiffies, lpm_timeout))
+-		return true;
+-
+-	return false;
++	return !!(link->lpm_policy > ATA_LPM_MAX_POWER);
+ }
+ EXPORT_SYMBOL_GPL(sata_lpm_ignore_phy_events);
+ 
+--- a/drivers/ata/libata-eh.c
++++ b/drivers/ata/libata-eh.c
+@@ -3490,9 +3490,6 @@ static int ata_eh_set_lpm(struct ata_lin
+ 		}
+ 	}
+ 
+-	link->last_lpm_change = jiffies;
+-	link->flags |= ATA_LFLAG_CHANGED;
+-
+ 	return 0;
+ 
+ fail:
+--- a/include/linux/libata.h
++++ b/include/linux/libata.h
+@@ -204,7 +204,6 @@ enum {
+ 	ATA_LFLAG_SW_ACTIVITY	= (1 << 7), /* keep activity stats */
+ 	ATA_LFLAG_NO_LPM	= (1 << 8), /* disable LPM on this link */
+ 	ATA_LFLAG_RST_ONCE	= (1 << 9), /* limit recovery to one reset */
+-	ATA_LFLAG_CHANGED	= (1 << 10), /* LPM state changed on this link */
+ 
+ 	/* struct ata_port flags */
+ 	ATA_FLAG_SLAVE_POSS	= (1 << 0), /* host supports slave dev */
+@@ -309,12 +308,6 @@ enum {
+ 	 */
+ 	ATA_TMOUT_PMP_SRST_WAIT	= 5000,
+ 
+-	/* When the LPM policy is set to ATA_LPM_MAX_POWER, there might
+-	 * be a spurious PHY event, so ignore the first PHY event that
+-	 * occurs within 10s after the policy change.
+-	 */
+-	ATA_TMOUT_SPURIOUS_PHY	= 10000,
+-
+ 	/* ATA bus states */
+ 	BUS_UNKNOWN		= 0,
+ 	BUS_DMA			= 1,
+@@ -793,8 +786,6 @@ struct ata_link {
+ 	struct ata_eh_context	eh_context;
+ 
+ 	struct ata_device	device[ATA_MAX_DEVICES];
+-
+-	unsigned long		last_lpm_change; /* when last LPM change happened */
+ };
+ #define ATA_LINK_CLEAR_BEGIN		offsetof(struct ata_link, active_tag)
+ #define ATA_LINK_CLEAR_END		offsetof(struct ata_link, device[0])

Added: dists/jessie/linux/debian/patches/debian/udp-fix-abi-change-in-3.16.7-ckt14.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/jessie/linux/debian/patches/debian/udp-fix-abi-change-in-3.16.7-ckt14.patch	Sun Jul 26 02:36:03 2015	(r22857)
@@ -0,0 +1,19 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: udp: Fix ABI change in 3.16.7-ckt14
+Forwarded: not-needed
+
+Hide the new #include from genksyms.
+
+
+--- a/net/ipv4/udp.c
++++ b/net/ipv4/udp.c
+@@ -90,7 +90,9 @@
+ #include <linux/socket.h>
+ #include <linux/sockios.h>
+ #include <linux/igmp.h>
++#ifndef __GENKSYMS__
+ #include <linux/inetdevice.h>
++#endif
+ #include <linux/in.h>
+ #include <linux/errno.h>
+ #include <linux/timer.h>

Modified: dists/jessie/linux/debian/patches/series
==============================================================================
--- dists/jessie/linux/debian/patches/series	Sat Jul 25 21:18:36 2015	(r22856)
+++ dists/jessie/linux/debian/patches/series	Sun Jul 26 02:36:03 2015	(r22857)
@@ -628,3 +628,5 @@
 bugfix/x86/0007-x86-nmi-64-Improve-nested-NMI-comments.patch
 bugfix/x86/0008-x86-nmi-64-Reorder-nested-NMI-checks.patch
 bugfix/x86/0009-x86-nmi-64-Use-DF-to-avoid-userspace-RSP-confusing-n.patch
+debian/revert-libata-ignore-spurious-phy-event-on-lpm-polic.patch
+debian/udp-fix-abi-change-in-3.16.7-ckt14.patch

