[kernel] r19432 - in dists/sid/linux/debian: . patches patches/bugfix/all patches/debian

Fri Oct 12 02:49:03 UTC 2012

Author: benh
Date: Fri Oct 12 02:49:02 2012
New Revision: 19432

Log:
Update to 3.2.31

Drop 2 patches included in it.
Add some more hideous hacks to maintain ABI.

Added:
   dists/sid/linux/debian/patches/debian/hid-avoid-ABI-change-in-3.2.31.patch
   dists/sid/linux/debian/patches/debian/xfrm-avoid-ABI-change-in-3.2.31.patch
Deleted:
   dists/sid/linux/debian/patches/bugfix/all/rds-set-correct-msg_namelen.patch
   dists/sid/linux/debian/patches/bugfix/all/tg3-Fix-TSO-CAP-for-5704-devs-w-ASF-enabled.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================

--- dists/sid/linux/debian/changelog	Wed Oct 10 05:43:52 2012	(r19431)
+++ dists/sid/linux/debian/changelog	Fri Oct 12 02:49:02 2012	(r19432)
@@ -1,5 +1,28 @@
-linux (3.2.30-2) UNRELEASED; urgency=low
+linux (3.2.31-1) UNRELEASED; urgency=low
 
+  * New upstream stable update:
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.31
+    - target: Fix ->data_length re-assignment bug with SCSI overflow
+    - hpsa: fix handling of protocol error
+    - cifs: fix return value in cifsConvertToUTF16
+    - asix: Support DLink DUB-E100 H/W Ver C1 (Closes: #687567)
+    - dj: memory scribble in logi_dj
+    - dm: handle requests beyond end of device instead of using BUG_ON
+    - md/raid10: fix "enough" function for detecting if array is failed.
+    - libata: Prevent interface errors with Seagate FreeAgent GoFlex
+    - vfs: dcache: fix deadlock in tree traversal
+    - Revert "drm/radeon: rework pll selection (v3)" (regression in 3.2.30)
+    - HID: hidraw: don't deallocate memory when it is in use
+    - xfrm: Workaround incompatibility of ESN and async crypto
+    - xfrm_user: fix various information leaks
+    - xfrm_user: ensure user supplied esn replay window is valid
+    - net: guard tcp_set_keepalive() to tcp sockets
+    - ipv4: raw: fix icmp_filter()
+    - ipv6: raw: fix icmpv6_filter()
+    - ipv6: mip6: fix mip6_mh_filter()
+    - netrom: copy_datagram_iovec can fail
+
+  [ Ben Hutchings ]
   * codel: refine one condition to avoid a nul rec_inv_sqrt
   * [mips,mipsel] Ignore NFS/SunRPC ABI changes in 3.2.30 (fixes FTBFS)
   * tg3: Fix TSO CAP for 5704 devs w / ASF enabled

Added: dists/sid/linux/debian/patches/debian/hid-avoid-ABI-change-in-3.2.31.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/hid-avoid-ABI-change-in-3.2.31.patch	Fri Oct 12 02:49:02 2012	(r19432)
@@ -0,0 +1,41 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: hid: Avoid ABI change in 3.2.31
+
+Commit b6787242f32700377d3da3b8d788ab3928bab849 ('HID: hidraw: add
+proper error handling to raw event reporting') changed the return type
+of hid_report_raw_event() and hidraw_report_event() from void to int
+(an error number).  Any existing OOT callers are going to ignore this
+value, whether or not they get recompiled.  Therefore, hide the change
+from genksyms.
+--- a/include/linux/hid.h
++++ b/include/linux/hid.h
+@@ -875,8 +875,14 @@ static inline int hid_hw_power(struct hi
+ 	return hdev->ll_driver->power ? hdev->ll_driver->power(hdev, level) : 0;
+ }
+ 
++#ifdef __GENKSYMS__
++/* Old callers will ignore the return value even if we change the return type */
++void hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size,
++		int interrupt);
++#else
+ int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size,
+ 		int interrupt);
++#endif
+ 
+ extern int hid_generic_init(void);
+ extern void hid_generic_exit(void);
+--- a/include/linux/hidraw.h
++++ b/include/linux/hidraw.h
+@@ -76,7 +76,12 @@ struct hidraw_list {
+ #ifdef CONFIG_HIDRAW
+ int hidraw_init(void);
+ void hidraw_exit(void);
++#ifdef __GENKSYMS__
++/* Old callers will ignore the return value even if we change the return type */
++void hidraw_report_event(struct hid_device *, u8 *, int);
++#else
+ int hidraw_report_event(struct hid_device *, u8 *, int);
++#endif
+ int hidraw_connect(struct hid_device *);
+ void hidraw_disconnect(struct hid_device *);
+ #else

Added: dists/sid/linux/debian/patches/debian/xfrm-avoid-ABI-change-in-3.2.31.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/xfrm-avoid-ABI-change-in-3.2.31.patch	Fri Oct 12 02:49:02 2012	(r19432)
@@ -0,0 +1,28 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: xfrm: Avoid ABI change in 3.2.31
+
+Commit 3b59df46a449ec9975146d71318c4777ad086744 ('xfrm: Workaround
+incompatibility of ESN and async crypto') added a new operation
+'recheck' to struct xfrm_replay.  There is only one instance which
+needs this to be different than 'check'.  So instead of adding the
+operation, check whether we're using that instance and call the
+recheck implementation directly.
+
+--- a/include/net/xfrm.h
++++ b/include/net/xfrm.h
+@@ -269,11 +269,13 @@ struct xfrm_replay {
+ 	int	(*check)(struct xfrm_state *x,
+ 			 struct sk_buff *skb,
+ 			 __be32 net_seq);
++	void	(*notify)(struct xfrm_state *x, int event);
++	int	(*overflow)(struct xfrm_state *x, struct sk_buff *skb);
++#ifndef __GENKSYMS__
+ 	int	(*recheck)(struct xfrm_state *x,
+ 			   struct sk_buff *skb,
+ 			   __be32 net_seq);
+-	void	(*notify)(struct xfrm_state *x, int event);
+-	int	(*overflow)(struct xfrm_state *x, struct sk_buff *skb);
++#endif
+ };
+ 
+ struct net_device;

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Wed Oct 10 05:43:52 2012	(r19431)
+++ dists/sid/linux/debian/patches/series	Fri Oct 12 02:49:02 2012	(r19432)
@@ -387,7 +387,6 @@
 features/all/bql/igb-ixgbe-netdev_tx_reset_queue-incorrectly-called-from-tx-init.patch
 features/all/bql/skge-add-byte-queue-limit-support.patch
 
-bugfix/all/rds-set-correct-msg_namelen.patch
 bugfix/all/PCI-PM-Runtime-make-PCI-traces-quieter.patch
 bugfix/all/media-rc-ite-cir-Initialise-ite_dev-rdev-earlier.patch
 features/all/USB-add-USB_VENDOR_AND_INTERFACE_INFO-macro.patch
@@ -398,6 +397,7 @@
 features/arm/ahci-Add-JMicron-362-device-IDs.patch
 bugfix/all/speakup-lower-default-software-speech-rate.patch
 debian/perf-hide-abi-change-in-3.2.30.patch
-bugfix/all/tg3-Fix-TSO-CAP-for-5704-devs-w-ASF-enabled.patch
 bugfix/all/SUNRPC-Set-alloc_slot-for-backchannel-tcp-ops.patch
 debian/iwlwifi-do-not-request-unreleased-firmware.patch
+debian/hid-avoid-ABI-change-in-3.2.31.patch
+debian/xfrm-avoid-ABI-change-in-3.2.31.patch

