[kernel] r19509 - in dists/sid/linux/debian: . config/i386 patches patches/debian

Ben Hutchings benh at alioth.debian.org
Sun Nov 18 03:56:23 UTC 2012 

Author: benh
Date: Sun Nov 18 03:56:22 2012
New Revision: 19509

Log:
Update to 3.2.34

Avoid 2 ABI changes in ALSA and rtnetlink.  Ignore ABI change for
removal of disable_hlt() and enable_hlt() on i386; they were only
meant for use by the floppy driver.

Added:
   dists/sid/linux/debian/patches/debian/ALSA-avoid-ABI-change-in-3.2.34.patch
   dists/sid/linux/debian/patches/debian/rtnetlink-avoid-ABI-change-in-3.2.34.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/i386/defines
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Sun Nov 18 01:30:08 2012	(r19508)
+++ dists/sid/linux/debian/changelog	Sun Nov 18 03:56:22 2012	(r19509)
@@ -1,4 +1,4 @@
-linux (3.2.33-1) UNRELEASED; urgency=low
+linux (3.2.34-1) UNRELEASED; urgency=low
 
   * New upstream stable update:
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.33
@@ -24,6 +24,34 @@
     - sysfs: sysfs_pathname/sysfs_add_one: Use strlcat() instead of strcat()
     - fs/compat_ioctl.c: VIDEO_SET_SPU_PALETTE missing error check
     - netfilter: nf_conntrack: fix racy timer handling with reliable events
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.34
+    - x86: Remove the ancient and deprecated disable_hlt() and enable_hlt()
+      facility (Closes: #667501)
+    - ALSA: PCM: Fix some races at disconnection
+    - ALSA: usb-audio: Fix races at disconnection
+    - crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent
+      data corruption
+    - mac80211: Only process mesh config header on frames that RA_MATCH
+    - mac80211: fix SSID copy on IBSS JOIN
+    - mac80211: check management frame header length
+    - mac80211: verify that skb data is present
+    - mac80211: make sure data is accessible in EAPOL check
+    - ath9k: Test for TID only in BlockAcks while checking tx status
+    - nfs: Show original device name verbatim in /proc/*/mount{s,info}
+      (Closes: #669314)
+    - target: Avoid integer overflow in se_dev_align_max_sectors()
+    - hwmon: (w83627ehf) Force initial bank selection
+    - xfs: fix reading of wrapped log data
+    - fanotify: fix missing break
+    - drm/vmwgfx: Fix a case where the code would BUG when trying to pin
+      GMR memory
+    - sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()
+    - netlink: use kfree_rcu() in netlink_release()
+    - tcp: fix FIONREAD/SIOCINQ
+    - net: fix divide by zero in tcp algorithm illinois
+    - af-packet: fix oops when socket is not present
+    - r8169: Fix WoL on RTL8168d/8111d.
+    - sky2: Fix for interrupt handler (Closes: #681280)
 
   [ Ben Hutchings ]
   * [x86] udeb: Re-add isci to scsi-extra-modules (Closes: #690886;
@@ -50,7 +78,7 @@
   [ Ian Campbell ]
   * [xen] add support for microcode updating. (Closes: #693053)
 
- -- Ben Hutchings <ben at decadent.org.uk>  Wed, 24 Oct 2012 14:15:57 +0100
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 18 Nov 2012 01:30:28 +0000
 
 linux (3.2.32-1) unstable; urgency=low
 

Modified: dists/sid/linux/debian/config/i386/defines
==============================================================================
--- dists/sid/linux/debian/config/i386/defines	Sun Nov 18 01:30:08 2012	(r19508)
+++ dists/sid/linux/debian/config/i386/defines	Sun Nov 18 03:56:22 2012	(r19509)
@@ -1,3 +1,8 @@
+[abi]
+ignore-changes:
+ disable_hlt
+ enable_hlt
+
 [base]
 featuresets:
  none

Added: dists/sid/linux/debian/patches/debian/ALSA-avoid-ABI-change-in-3.2.34.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/ALSA-avoid-ABI-change-in-3.2.34.patch	Sun Nov 18 03:56:22 2012	(r19509)
@@ -0,0 +1,37 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: ALSA: avoid ABI change in 3.2.34
+Date: Sun, 18 Nov 2012 03:10:21 +0000
+
+Commit 3b4a36722e5e518e4bdd3a215d8a1c5adc18e911 ('ALSA: Add a
+reference counter to card instance', commit
+a0830dbd4e42b38aefdf3fb61ba5019a1a99ea85 upstream) added a
+reference count to struct snd_card.
+
+This structure must be allocated by snd_card_create(), not by drivers.
+It allocates space after the structure for driver-specific data, but
+drivers should access this via the private_data pointer initialised by
+snd_card_create(), not using sizeof(struct snd_card).  Therefore we
+can move the new member to the end of the structure and hide it from
+genksyms, and there is no ABI change.
+
+---
+--- a/include/sound/core.h
++++ b/include/sound/core.h
+@@ -132,7 +132,6 @@ struct snd_card {
+ 	int shutdown;			/* this card is going down */
+ 	int free_on_last_close;		/* free in context of file_release */
+ 	wait_queue_head_t shutdown_sleep;
+-	atomic_t refcount;		/* refcount for disconnection */
+ 	struct device *dev;		/* device assigned to this card */
+ 	struct device *card_dev;	/* cardX object for sysfs */
+ 
+@@ -146,6 +145,9 @@ struct snd_card {
+ 	struct snd_mixer_oss *mixer_oss;
+ 	int mixer_oss_change_count;
+ #endif
++#ifndef __GENKSYMS__
++	atomic_t refcount;		/* refcount for disconnection */
++#endif
+ };
+ 
+ #ifdef CONFIG_PM

Added: dists/sid/linux/debian/patches/debian/rtnetlink-avoid-ABI-change-in-3.2.34.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/rtnetlink-avoid-ABI-change-in-3.2.34.patch	Sun Nov 18 03:56:22 2012	(r19509)
@@ -0,0 +1,45 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: rtnetlink: avoid ABI change in 3.2.34
+Date: Sun, 18 Nov 2012 03:25:48 +0000
+
+Commit d318a127e273716c9531fe70d497ca24db4c0bf1 ('rtnetlink: Fix
+problem with buffer allocation', commit
+115c9b81928360d769a76c632bae62d15206a94a upstream) added a parameter
+to the optional 'calcit' callback for rtnetlink operations.  There is
+only one in-tree implementation and it's in the same file as the
+caller, so call it directly with the extra argument when necessary.
+
+---
+--- a/include/net/rtnetlink.h
++++ b/include/net/rtnetlink.h
+@@ -6,7 +6,7 @@
+ 
+ typedef int (*rtnl_doit_func)(struct sk_buff *, struct nlmsghdr *, void *);
+ typedef int (*rtnl_dumpit_func)(struct sk_buff *, struct netlink_callback *);
+-typedef u16 (*rtnl_calcit_func)(struct sk_buff *, struct nlmsghdr *);
++typedef u16 (*rtnl_calcit_func)(struct sk_buff *);
+ 
+ extern int	__rtnl_register(int protocol, int msgtype,
+ 				rtnl_doit_func, rtnl_dumpit_func,
+--- a/net/core/rtnetlink.c
++++ b/net/core/rtnetlink.c
+@@ -2020,7 +2020,9 @@ static int rtnetlink_rcv_msg(struct sk_b
+ 			return -EOPNOTSUPP;
+ 		calcit = rtnl_get_calcit(family, type);
+ 		if (calcit)
+-			min_dump_alloc = calcit(skb, nlh);
++			min_dump_alloc = calcit(skb);
++		else if (type == RTM_GETLINK)
++			min_dump_alloc = rtnl_calcit(skb, nlh);
+ 
+ 		__rtnl_unlock();
+ 		rtnl = net->rtnl;
+@@ -2136,7 +2138,7 @@ void __init rtnetlink_init(void)
+ 	register_netdevice_notifier(&rtnetlink_dev_notifier);
+ 
+ 	rtnl_register(PF_UNSPEC, RTM_GETLINK, rtnl_getlink,
+-		      rtnl_dump_ifinfo, rtnl_calcit);
++		      rtnl_dump_ifinfo, NULL);
+ 	rtnl_register(PF_UNSPEC, RTM_SETLINK, rtnl_setlink, NULL, NULL);
+ 	rtnl_register(PF_UNSPEC, RTM_NEWLINK, rtnl_newlink, NULL, NULL);
+ 	rtnl_register(PF_UNSPEC, RTM_DELLINK, rtnl_dellink, NULL, NULL);

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Sun Nov 18 01:30:08 2012	(r19508)
+++ dists/sid/linux/debian/patches/series	Sun Nov 18 03:56:22 2012	(r19509)
@@ -409,3 +409,5 @@
 
 features/all/xen/microcode.patch
 debian/radeon-no-modeset-without-firmware.patch
+debian/ALSA-avoid-ABI-change-in-3.2.34.patch
+debian/rtnetlink-avoid-ABI-change-in-3.2.34.patch

More information about the Kernel-svn-changes mailing list