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

[Ben Hutchings]

Author: benh
Date: Sun Jun 10 15:30:24 2012
New Revision: 19116

Log:
Update to 3.2.20

Added:
   dists/sid/linux/debian/patches/debian/net-restore-skb_set_dev-removed-in-3.2.20.patch
Deleted:
   dists/sid/linux/debian/patches/bugfix/all/acpi-battery-only-refresh-the-sysfs-files-when-pertinent.patch
   dists/sid/linux/debian/patches/bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch
   dists/sid/linux/debian/patches/bugfix/all/fix-scsi_wait_scan.patch
   dists/sid/linux/debian/patches/bugfix/all/hugetlb-fix-resv_map-leak-in-error-path.patch
   dists/sid/linux/debian/patches/bugfix/all/mm-fix-vma_resv_map-null-pointer.patch
   dists/sid/linux/debian/patches/bugfix/arm/ARM-ixp4xx-gpiolib-support.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Sun Jun 10 02:19:02 2012	(r19115)
+++ dists/sid/linux/debian/changelog	Sun Jun 10 15:30:24 2012	(r19116)
@@ -1,4 +1,4 @@
-linux (3.2.19-2) UNRELEASED; urgency=low
+linux (3.2.20-1) UNRELEASED; urgency=low
 
   * The "Confused? You Won't Be" release
 

Added: dists/sid/linux/debian/patches/debian/net-restore-skb_set_dev-removed-in-3.2.20.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/net-restore-skb_set_dev-removed-in-3.2.20.patch	Sun Jun 10 15:30:24 2012	(r19116)
@@ -0,0 +1,17 @@
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -1869,6 +1869,14 @@
+ }
+ EXPORT_SYMBOL(netif_device_attach);
+ 
++/* This function was a bad idea and was removed in 3.2.20 */
++void skb_set_dev(struct sk_buff *skb, struct net_device *dev)
++{
++	WARN_ON_ONCE(!net_eq(dev_net(skb->dev), dev_net(dev)));
++	skb->dev = dev;
++}
++EXPORT_SYMBOL(skb_set_dev);
++
+ /*
+  * Invalidate hardware checksum when packet is to be mangled, and
+  * complete checksum manually on outgoing path.

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Sun Jun 10 02:19:02 2012	(r19115)
+++ dists/sid/linux/debian/patches/series	Sun Jun 10 15:30:24 2012	(r19116)
@@ -53,7 +53,6 @@
 debian/x86-memtest-WARN-if-bad-RAM-found.patch
 bugfix/all/snapshot-Implement-compat_ioctl.patch
 debian/ARM-Remove-use-of-possibly-undefined-BUILD_BUG_ON-in.patch
-bugfix/arm/ARM-ixp4xx-gpiolib-support.patch
 bugfix/arm/ARM-topdown-mmap.patch
 bugfix/alpha/alpha-add-io-read-write-16-32-be-functions.patch
 features/arm/ARM-kirkwood-6282A1.patch
@@ -190,6 +189,7 @@
 debian/usb-hcd-avoid-ABI-change-in-3.2.17.patch
 debian/fork-avoid-ABI-change-in-3.2.18.patch
 debian/mmc-Avoid-ABI-change-in-3.2.19.patch
+debian/net-restore-skb_set_dev-removed-in-3.2.20.patch
 
 bugfix/all/ext4-Report-max_batch_time-option-correctly.patch
 
@@ -224,8 +224,6 @@
 features/all/rt2x00-add-debug-message-for-new-chipset.patch
 features/all/rt2x00-add-rt5372-chipset-support.patch
 
-bugfix/all/acpi-battery-only-refresh-the-sysfs-files-when-pertinent.patch
-
 # Update be2net driver to 3.5ish
 features/all/be2net/0001-sweep-the-floors-and-convert-some-.get_drvinfo-routi.patch
 features/all/be2net/0002-be2net-init-vf-_if_handle-vf_pmac_id-to-handle-failu.patch
@@ -298,19 +296,13 @@
 features/all/codel/0006-codel-use-u16-field-instead-of-31bits-for-rec_inv_sq.patch
 features/all/codel/0007-fq_codel-should-use-qdisc-backlog-as-threshold.patch
 
-bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch
-
 # AppArmor userland compatibility.  This had better be gone in wheezy+1!
 features/all/AppArmor-compatibility-patch-for-v5-interface.patch
 
 bugfix/x86/mm-pmd_read_atomic-fix-32bit-pae-pmd-walk-vs-pmd_populate-smp-race.patch
 bugfix/x86/thp-avoid-atomic64_read-in-pmd_read_atomic-for-32bit-pae.patch
-bugfix/all/hugetlb-fix-resv_map-leak-in-error-path.patch
-bugfix/all/mm-fix-vma_resv_map-null-pointer.patch
 bugfix/all/hugepages-fix-use-after-free-bug-in-quota-handling.patch
 
-bugfix/all/fix-scsi_wait_scan.patch
-
 # netdev features, probably useful for other backports but not needed yet
 #features/all/define-netdev_features_t.patch
 #features/all/filter-Allow-to-create-sk-unattached-filters.patch