[kernel] r19230 - in dists/squeeze-backports/linux: . debian debian/bin debian/config debian/config/kernelarch-x86 debian/config/s390 debian/config/s390x debian/lib/python/debian_linux debian/patches debian/patches/bugfix/all debian/patches/bugfix/arm debian/patches/bugfix/x86 debian/patches/debian debian/patches/features/all debian/patches/features/all/hidepid debian/patches/features/all/rt debian/source debian/templates
Ben Hutchings
benh at alioth.debian.org
Fri Jun 29 01:10:00 UTC 2012
Author: benh
Date: Fri Jun 29 01:09:59 2012
New Revision: 19230
Log:
Merge changes from sid up to 3.2.20-1
Added:
dists/squeeze-backports/linux/debian/patches/bugfix/all/KVM-Fix-buffer-overflow-in-kvm_set_irq.patch
- copied unchanged from r19123, dists/sid/linux/debian/patches/bugfix/all/KVM-Fix-buffer-overflow-in-kvm_set_irq.patch
dists/squeeze-backports/linux/debian/patches/bugfix/all/NFSv4-Further-reduce-the-footprint-of-the-idmapper.patch
- copied unchanged from r19123, dists/sid/linux/debian/patches/bugfix/all/NFSv4-Further-reduce-the-footprint-of-the-idmapper.patch
dists/squeeze-backports/linux/debian/patches/bugfix/all/NFSv4-Reduce-the-footprint-of-the-idmapper.patch
- copied unchanged from r19123, dists/sid/linux/debian/patches/bugfix/all/NFSv4-Reduce-the-footprint-of-the-idmapper.patch
dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-fix-offset-calculation-when-buildin.patch
- copied unchanged from r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-fix-offset-calculation-when-buildin.patch
dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-fix-truesize-underestimation.patch
- copied unchanged from r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-fix-truesize-underestimation.patch
dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-put-page-when-fail-to-get-all-reque.patch
- copied unchanged from r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-put-page-when-fail-to-get-all-reque.patch
dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-set-SKBTX_DEV_ZEROCOPY-only-when-sk.patch
- copied unchanged from r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-set-SKBTX_DEV_ZEROCOPY-only-when-sk.patch
dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-validate-vectors-before-building-sk.patch
- copied unchanged from r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-validate-vectors-before-building-sk.patch
dists/squeeze-backports/linux/debian/patches/bugfix/all/net-sock-validate-data_len-before-allocating-skb-in-.patch
- copied unchanged from r19123, dists/sid/linux/debian/patches/bugfix/all/net-sock-validate-data_len-before-allocating-skb-in-.patch
dists/squeeze-backports/linux/debian/patches/bugfix/x86/thp-avoid-atomic64_read-in-pmd_read_atomic-for-32bit-pae.patch
- copied unchanged from r19123, dists/sid/linux/debian/patches/bugfix/x86/thp-avoid-atomic64_read-in-pmd_read_atomic-for-32bit-pae.patch
dists/squeeze-backports/linux/debian/patches/debian/avoid-ABI-change-for-hidepid.patch
- copied unchanged from r19123, dists/sid/linux/debian/patches/debian/avoid-ABI-change-for-hidepid.patch
dists/squeeze-backports/linux/debian/patches/debian/net-restore-skb_set_dev-removed-in-3.2.20.patch
- copied unchanged from r19123, dists/sid/linux/debian/patches/debian/net-restore-skb_set_dev-removed-in-3.2.20.patch
dists/squeeze-backports/linux/debian/patches/features/all/define-netdev_features_t.patch
- copied unchanged from r19123, dists/sid/linux/debian/patches/features/all/define-netdev_features_t.patch
dists/squeeze-backports/linux/debian/patches/features/all/filter-Allow-to-create-sk-unattached-filters.patch
- copied unchanged from r19123, dists/sid/linux/debian/patches/features/all/filter-Allow-to-create-sk-unattached-filters.patch
dists/squeeze-backports/linux/debian/patches/features/all/hidepid/
- copied from r19123, dists/sid/linux/debian/patches/features/all/hidepid/
dists/squeeze-backports/linux/debian/patches/series
- copied unchanged from r19123, dists/sid/linux/debian/patches/series
dists/squeeze-backports/linux/debian/source/local-options
- copied unchanged from r19123, dists/sid/linux/debian/source/local-options
dists/squeeze-backports/linux/debian/source/options
- copied unchanged from r19123, dists/sid/linux/debian/source/options
Deleted:
dists/squeeze-backports/linux/debian/patches/bugfix/all/acpi-battery-only-refresh-the-sysfs-files-when-pertinent.patch
dists/squeeze-backports/linux/debian/patches/bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch
dists/squeeze-backports/linux/debian/patches/bugfix/all/fix-scsi_wait_scan.patch
dists/squeeze-backports/linux/debian/patches/bugfix/all/hugetlb-fix-resv_map-leak-in-error-path.patch
dists/squeeze-backports/linux/debian/patches/bugfix/all/mm-fix-vma_resv_map-null-pointer.patch
dists/squeeze-backports/linux/debian/patches/bugfix/arm/ARM-ixp4xx-gpiolib-support.patch
dists/squeeze-backports/linux/debian/patches/series-all
dists/squeeze-backports/linux/debian/patches/series-none
Modified:
dists/squeeze-backports/linux/ (props changed)
dists/squeeze-backports/linux/debian/README.source
dists/squeeze-backports/linux/debian/bin/check-patches.sh
dists/squeeze-backports/linux/debian/bin/genorig.py
dists/squeeze-backports/linux/debian/bin/patch.apply
dists/squeeze-backports/linux/debian/bin/test-patches
dists/squeeze-backports/linux/debian/changelog
dists/squeeze-backports/linux/debian/config/config
dists/squeeze-backports/linux/debian/config/kernelarch-x86/config
dists/squeeze-backports/linux/debian/config/s390/defines
dists/squeeze-backports/linux/debian/config/s390x/defines
dists/squeeze-backports/linux/debian/lib/python/debian_linux/gencontrol.py
dists/squeeze-backports/linux/debian/patches/bugfix/all/cpu-Register-a-generic-CPU-device-on-architectures-t.patch
dists/squeeze-backports/linux/debian/patches/debian/arch-sh4-fix-uimage-build.patch
dists/squeeze-backports/linux/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch
dists/squeeze-backports/linux/debian/patches/debian/kernelvariables.patch
dists/squeeze-backports/linux/debian/patches/debian/version.patch
dists/squeeze-backports/linux/debian/patches/features/all/rt/check-series
dists/squeeze-backports/linux/debian/patches/series-rt
dists/squeeze-backports/linux/debian/rules
dists/squeeze-backports/linux/debian/rules.real
dists/squeeze-backports/linux/debian/source/format
dists/squeeze-backports/linux/debian/templates/control.source.in
Modified: dists/squeeze-backports/linux/debian/README.source
==============================================================================
--- dists/squeeze-backports/linux/debian/README.source Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/README.source Fri Jun 29 01:09:59 2012 (r19230)
@@ -23,41 +23,20 @@
Applying patches to the Debian kernel tree
==========================================
-The Debian kernel packaging uses a custom patching system:
+The Debian kernel packaging uses the quilt patch system, but with
+multiple series to allow for featuresets.
Patches are stored below debian/patches, loosely sorted in bugfix/,
features/ and debian/. Patches are in the standard kernel patch
format (unified diff to be applied with patch -p1) and generally have
DEP-3 headers.
-The order and the selection of patches which are applied during build
-time are specified in the series/ subdirectory. The series file 'base'
-is used for all configurations and the series file 'base-extra' is
-additionally used for optional featuresets.
-
-Let's look at the actual series file for 2.6.26-12:
-
-+ bugfix/all/net-unix-gc-fix-soft-lockups-oom-issues.patch
-+ bugfix/all/inotify-watch-removal-umount-races.patch
-+ bugfix/all/atm-duplicate-listen-on-socket-corrupts-the-vcc-table.patch
-+ bugfix/all/ata-pata_marvell-vs-ahci.patch
-+ features/sparc/video-sunxvr500-intergraph.patch
-
-The patches to be applied are specified relative to debian/patches
-and must be preceded by a "+". The series files may be arbitrarily
-documented with comments starting with "#".
-
-Let's now have a look at the series file for the addon kernel flavours
-of 2.6.26-12:
-
-+ features/all/xen/dom0-fix-processor-throttling-when-pr-id-is-minus-1.patch featureset=xen
-
-The same syntax applies for specifing the patches, but an additional
-argument is needed which specifies the featureset the patch applies to.
-
+The series file 'series-all' is used for all configurations and a
+series file 'series-<featureset>' is used for each optional
+featureset.
If you want to generate a source tree with all patches applied, run
-make -f debian/rules source-all
+make -f debian/rules source
The resulting source can be found below debian/build.
Modified: dists/squeeze-backports/linux/debian/bin/check-patches.sh
==============================================================================
--- dists/squeeze-backports/linux/debian/bin/check-patches.sh Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/bin/check-patches.sh Fri Jun 29 01:09:59 2012 (r19230)
@@ -2,7 +2,7 @@
TMPDIR=$(mktemp -d)
trap "rm -rf $TMPDIR" EXIT
-grep -v "^#" debian/patches/series/* | awk '{if (NF >= 2) print "debian/patches/" $2}' | sort -u > $TMPDIR/used
+sed '/^#/d; /^[[:space:]]*$/d; s/^[+X] //; s,^,debian/patches/,' debian/patches/series* | sort -u > $TMPDIR/used
find debian/patches ! -path '*/series*' -type f -name "*.diff" -o -name "*.patch" -printf "%p\n" | sort > $TMPDIR/avail
echo "Used patches"
echo "=============="
Modified: dists/squeeze-backports/linux/debian/bin/genorig.py
==============================================================================
--- dists/squeeze-backports/linux/debian/bin/genorig.py Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/bin/genorig.py Fri Jun 29 01:09:59 2012 (r19230)
@@ -33,7 +33,7 @@
self.log('Using source name %s, version %s, dfsg %s\n' % (source, version.upstream, self.version_dfsg))
self.orig = '%s-%s' % (source, version.upstream)
- self.orig_tar = '%s_%s.orig.tar.gz' % (source, version.upstream)
+ self.orig_tar = '%s_%s.orig.tar.xz' % (source, version.upstream)
self.tag = 'v' + version.linux_upstream_full
def __call__(self):
@@ -117,7 +117,7 @@
except OSError:
pass
self.log("Generate tarball %s\n" % out)
- cmdline = ['tar -czf', out, '-C', self.dir, self.orig]
+ cmdline = ['tar -caf', out, '-C', self.dir, self.orig]
try:
if os.spawnv(os.P_WAIT, '/bin/sh', ['sh', '-c', ' '.join(cmdline)]):
raise RuntimeError("Can't patch source")
Modified: dists/squeeze-backports/linux/debian/bin/patch.apply
==============================================================================
--- dists/squeeze-backports/linux/debian/bin/patch.apply Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/bin/patch.apply Fri Jun 29 01:09:59 2012 (r19230)
@@ -1,50 +0,0 @@
-#!/usr/bin/env python
-
-import os, os.path, re, sys
-from warnings import warn
-from debian_linux.patches import PatchSeries
-
-def main():
- options, args = parse_options()
-
- if len(args) > 1:
- print "Too much arguments"
- return
-
- home = options.home
- name = options.featureset or "all"
- fp = file(os.path.join(home, "series-%s" % name))
- PatchSeries(name, home, fp)()
-
-def parse_options():
- from optparse import OptionParser
- parser = OptionParser(
- usage = "%prog [OPTION]... [TARGET]",
- )
- parser.add_option(
- '-f', '--featureset',
- dest = 'featureset',
- help = "featureset",
- )
- parser.add_option(
- '-H', '--overwrite-home',
- dest = 'home',
- help = "overwrite home [no default]",
- )
-
- options, args = parser.parse_args()
-
- return options, args
-
-if __name__ == '__main__':
- def showwarning(message, category, filename, lineno,
- file=sys.stderr, line=''):
- file.write("Warning: %s\n" % message)
- import warnings
- warnings.showwarning = showwarning
- try:
- main()
- except RuntimeError, e:
- sys.stderr.write("Error: %s\n" % e)
- raise SystemExit, 1
-
Modified: dists/squeeze-backports/linux/debian/bin/test-patches
==============================================================================
--- dists/squeeze-backports/linux/debian/bin/test-patches Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/bin/test-patches Fri Jun 29 01:09:59 2012 (r19230)
@@ -8,7 +8,7 @@
kernelabi="$(uname -r)"
ff="${kernelabi#+([^-])-@(trunk|+([0-9]))-}"
if [ "x$ff" != "x$kernelabi" ]; then
- flavour="${ff#@(openvz|vserver|xen)-}"
+ flavour="${ff#@(openvz|rt|vserver|xen)-}"
if [ "x$flavour" != "x$ff" ]; then
featureset="${ff%-$flavour}"
else
@@ -33,9 +33,9 @@
echo >&2 "Usage: $0 [<options>] <patch>..."
cat >&2 <<EOF
Options:
- -f <flavour> specify the 'flavour' of kernel to build, e.g. 686
+ -f <flavour> specify the 'flavour' of kernel to build, e.g. 686-pae
-j <jobs> specify number of compiler jobs to run in parallel
- -s <featureset> specify an optional featureset to apply, e.g. xen
+ -s <featureset> specify an optional featureset to apply, e.g. rt
EOF
exit 2
fi
@@ -55,23 +55,24 @@
dch -v "$version" --distribution UNRELEASED "Testing patches $*"
fi
-restrictfeature=
-series="${version##*-}"
-if [ "$featureset" != none ]; then
- restrictfeature=" featureset=$featureset"
- series="${series}-extra"
+# Make new directory for patches
+mkdir -p debian/patches/test
+
+# Ignore user's .quiltrc
+alias quilt='quilt --quiltrc -'
+
+# Try to clean up any previous test patches
+if [ "$featureset" = none ]; then
+ while quilt top 2>/dev/null | grep -q ^test/; do
+ quilt delete
+ done
+else
+ sed -i '/^test\//d' debian/patches/series-${featureset}
fi
-# Copy all patches into a new directory
+# Prepare a new directory for the patches
rm -rf debian/patches/test/
mkdir debian/patches/test
-cp -t debian/patches/test/ "$@"
-
-# Generate patch series for the new version
->debian/patches/series/"$series"
-for patch in "$@"; do
- echo "+ test/$(basename "$patch")${restrictfeature}" >>debian/patches/series/"$series"
-done
# Regenerate control and included rules
rm debian/control debian/rules.gen
@@ -79,9 +80,17 @@
test -f debian/control
test -f debian/rules.gen
-# Clean and patch source
+# Clean up old build; apply existing patches for featureset
debian/rules clean
debian/rules source
+# Apply the additional patches
+for patch in "$@"; do
+ patch_abs="$(readlink -f "$patch")"
+ (cd "debian/build/source_${featureset}" && \
+ quilt import -P "test/$(basename "$patch")" "$patch_abs" && \
+ quilt push --fuzz=0)
+done
+
# Build selected binaries
fakeroot make -f debian/rules.gen binary-arch_"$arch"_"$featureset"_"$flavour"
Modified: dists/squeeze-backports/linux/debian/changelog
==============================================================================
--- dists/squeeze-backports/linux/debian/changelog Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/changelog Fri Jun 29 01:09:59 2012 (r19230)
@@ -1,22 +1,68 @@
-linux (3.2.19-2) UNRELEASED; urgency=low
+linux (3.2.20-1) unstable; urgency=low
- * The "Not Quite So Many Different Version Numbers" release
+ * The "Confused? You Won't Be" release
+
+ * New upstream stable update:
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.20
+ - cifs: fix oops while traversing open file list (try #4)
+ - mm/fork: fix overflow in vma length when copying mmap on clone
+ - mm: fix faulty initialization in vmalloc_init()
+ - x86, amd, xen: Avoid NULL pointer paravirt references
+ - ext4: force ro mount if ext4_setup_super() fails
+ - ext4: disallow hard-linked directory in ext4_lookup
+ - ext4: add missing save_error_info() to ext4_error()
+ - ALSA: usb-audio: fix rate_list memory leak
+ - Bluetooth: btusb: typo in Broadcom SoftSailing id (Closes: #674565)
+ - ipv4: Do not use dead fib_info entries.
+ - ipv4: fix the rcu race between free_fib_info and ip_route_output_slow
+ - l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC case
+ - btree: fix tree corruption in btree_get_prev()
+ - asix: allow full size 8021Q frames to be received (Closes: #676545)
+ - ext4: don't trash state flags in EXT4_IOC_SETFLAGS
+ - ext4: fix the free blocks calculation for ext3 file systems w/ uninit_bg
[ Ben Hutchings ]
* Rename source package to 'linux' (Closes: #636010)
+ * Convert source package format to 3.0 (quilt)
+ - Convert patch system to quilt, except for the 'orig' patch series
+ - Use xz compression for upstream and Debian tarballs
+ - README.source: Update description of patch system to match current
+ usage
+ - linux-patch-debian: Remove; it is no longer necessary for GPL
+ compliance and does not work with our current patch management
* linux-image: Change package name for bugs to 'src:linux' (Closes: #644198)
* DFSG: video: Remove nvidiafb and rivafb, which include apparently
- obfuscated code (Closes: #383481). The nouveau driver supports all
- the same hardware, aside from RIVA 128 (NV3).
+ obfuscated code (Closes: #383481, #609615). The nouveau driver supports
+ all the same hardware, aside from RIVA 128 (NV3).
* udeb: Add udf-modules containing UDF filesystem module (Closes: #613972)
* [mipsel/loongson2f] linux-image: Recommend libc6-loongson2f
(Closes: #629410)
* Build-Depend on kmod or module-init-tools, not just the latter
- * README.source: Update description of patch system to match current usage
- * linux-patch-debian: Remove; it is no longer necessary for GPL compliance
- and does not work with our current patch management
+ * test-patches: Recognise the rt featureset automatically
+ * udeb: Build-Depend on kernel-wedge >= 2.84; this allows us to list
+ modules as required even if they are built-in in some configurations
+ * filter: Allow to create sk-unattached filters
+ * proc: Backport hidepid mount option from Linux 3.4 (Closes: #669028)
+ * NFSv4: Reduce the footprint of the idmapper (Closes: #657078)
+ * [i386] thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE
+ (Closes: #676360)
+ * linux-source: Add single patch for each featureset
+ * [x86] Enable CRASH_DUMP, PROC_VMCORE (Closes: #623177)
+ * media/dvb: Enable DVB_DDBRIDGE as module (Closes: #676952)
+ * net: sock: validate data_len before allocating skb in
+ sock_alloc_send_pskb() (CVE-2012-2136)
+ * macvtap: zerocopy: fix offset calculation when building skb
+ * macvtap: zerocopy: fix truesize underestimation
+ * macvtap: zerocopy: put page when fail to get all requested user pages
+ * macvtap: zerocopy: set SKBTX_DEV_ZEROCOPY only when skb is built
+ successfully
+ * macvtap: zerocopy: validate vectors before building skb (CVE-2012-2119)
+ * KVM: Fix buffer overflow in kvm_set_irq() (CVE-2012-2137)
+
+ [ Bastian Blank ]
+ * [s390/s390x,s390x/s390x] Build debugging symbols.
- -- Ben Hutchings <ben at decadent.org.uk> Sat, 02 Jun 2012 20:31:53 +0100
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 11 Jun 2012 02:46:34 +0100
linux-2.6 (3.2.19-1) unstable; urgency=low
Modified: dists/squeeze-backports/linux/debian/config/config
==============================================================================
--- dists/squeeze-backports/linux/debian/config/config Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/config/config Fri Jun 29 01:09:59 2012 (r19230)
@@ -948,6 +948,11 @@
CONFIG_DVB_BT8XX=m
##
+## file: drivers/media/dvb/ddbridge/Kconfig
+##
+CONFIG_DVB_DDBRIDGE=m
+
+##
## file: drivers/media/dvb/dm1105/Kconfig
##
CONFIG_DVB_DM1105=m
@@ -2076,6 +2081,14 @@
CONFIG_SLIP_MODE_SLIP6=y
##
+## file: drivers/net/team/Kconfig
+##
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+
+##
## file: drivers/net/tokenring/Kconfig
##
CONFIG_TR=y
Modified: dists/squeeze-backports/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/squeeze-backports/linux/debian/config/kernelarch-x86/config Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/config/kernelarch-x86/config Fri Jun 29 01:09:59 2012 (r19230)
@@ -48,7 +48,7 @@
CONFIG_SECCOMP=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
+CONFIG_CRASH_DUMP=y
# CONFIG_KEXEC_JUMP is not set
CONFIG_RELOCATABLE=y
CONFIG_HOTPLUG_CPU=y
@@ -1571,6 +1571,11 @@
CONFIG_SUN_PARTITION=y
##
+## file: fs/proc/Kconfig
+##
+CONFIG_PROC_VMCORE=y
+
+##
## file: kernel/irq/Kconfig
##
CONFIG_SPARSE_IRQ=y
Modified: dists/squeeze-backports/linux/debian/config/s390/defines
==============================================================================
--- dists/squeeze-backports/linux/debian/config/s390/defines Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/config/s390/defines Fri Jun 29 01:09:59 2012 (r19230)
@@ -33,6 +33,9 @@
override-localversion: s390
type: plain-s390-tape
+[s390x_build]
+debug-info: true
+
[s390x_description]
hardware: IBM zSeries
parts: reader
Modified: dists/squeeze-backports/linux/debian/config/s390x/defines
==============================================================================
--- dists/squeeze-backports/linux/debian/config/s390x/defines Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/config/s390x/defines Fri Jun 29 01:09:59 2012 (r19230)
@@ -18,6 +18,9 @@
bootloaders: s390-tools
configs: s390/config
+[s390x_build]
+debug-info: true
+
[s390x_description]
hardware: IBM zSeries
parts: reader
Modified: dists/squeeze-backports/linux/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/squeeze-backports/linux/debian/lib/python/debian_linux/gencontrol.py Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/lib/python/debian_linux/gencontrol.py Fri Jun 29 01:09:59 2012 (r19230)
@@ -114,6 +114,8 @@
pass
def do_main_makefile(self, makefile, makeflags, extra):
+ makeflags = makeflags.copy()
+ makeflags['ALL_FEATURESETS'] = ' '.join(self.config['base', ]['featuresets'])
makefile.add('binary-indep', cmds=["$(MAKE) -f debian/rules.real binary-indep %s" % makeflags])
def do_main_packages(self, packages, vars, makeflags, extra):
Copied: dists/squeeze-backports/linux/debian/patches/bugfix/all/KVM-Fix-buffer-overflow-in-kvm_set_irq.patch (from r19123, dists/sid/linux/debian/patches/bugfix/all/KVM-Fix-buffer-overflow-in-kvm_set_irq.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/KVM-Fix-buffer-overflow-in-kvm_set_irq.patch Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/bugfix/all/KVM-Fix-buffer-overflow-in-kvm_set_irq.patch)
@@ -0,0 +1,33 @@
+From: Avi Kivity <avi at redhat.com>
+Date: Sun, 22 Apr 2012 17:02:11 +0300
+Subject: [PATCH] KVM: Fix buffer overflow in kvm_set_irq()
+
+commit f2ebd422f71cda9c791f76f85d2ca102ae34a1ed upstream.
+
+kvm_set_irq() has an internal buffer of three irq routing entries, allowing
+connecting a GSI to three IRQ chips or on MSI. However setup_routing_entry()
+does not properly enforce this, allowing three irqchip routes followed by
+an MSI route to overflow the buffer.
+
+Fix by ensuring that an MSI entry is added to an empty list.
+
+Signed-off-by: Avi Kivity <avi at redhat.com>
+---
+ virt/kvm/irq_comm.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
+index a6a0365..5afb431 100644
+--- a/virt/kvm/irq_comm.c
++++ b/virt/kvm/irq_comm.c
+@@ -332,6 +332,7 @@ static int setup_routing_entry(struct kvm_irq_routing_table *rt,
+ */
+ hlist_for_each_entry(ei, n, &rt->map[ue->gsi], link)
+ if (ei->type == KVM_IRQ_ROUTING_MSI ||
++ ue->type == KVM_IRQ_ROUTING_MSI ||
+ ue->u.irqchip.irqchip == ei->irqchip.irqchip)
+ return r;
+
+--
+1.7.10
+
Copied: dists/squeeze-backports/linux/debian/patches/bugfix/all/NFSv4-Further-reduce-the-footprint-of-the-idmapper.patch (from r19123, dists/sid/linux/debian/patches/bugfix/all/NFSv4-Further-reduce-the-footprint-of-the-idmapper.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/NFSv4-Further-reduce-the-footprint-of-the-idmapper.patch Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/bugfix/all/NFSv4-Further-reduce-the-footprint-of-the-idmapper.patch)
@@ -0,0 +1,124 @@
+From: Trond Myklebust <Trond.Myklebust at netapp.com>
+Date: Wed, 8 Feb 2012 13:39:15 -0500
+Subject: [2/2] NFSv4: Further reduce the footprint of the idmapper
+
+commit 685f50f9188ac1e8244d0340a9d6ea36b6136cec upstream.
+
+Don't allocate the legacy idmapper tables until we actually need
+them.
+
+Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
+Reviewed-by: Jeff Layton <jlayton at redhat.com>
+[bwh: Backported to 3.2: adjust context in nfs_idmap_delete()]
+---
+ fs/nfs/idmap.c | 42 ++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 36 insertions(+), 6 deletions(-)
+
+--- a/fs/nfs/idmap.c
++++ b/fs/nfs/idmap.c
+@@ -323,7 +323,7 @@
+
+ struct idmap_hashtable {
+ __u8 h_type;
+- struct idmap_hashent h_entries[IDMAP_HASH_SZ];
++ struct idmap_hashent *h_entries;
+ };
+
+ struct idmap {
+@@ -378,20 +378,39 @@
+ return 0;
+ }
+
++static void
++idmap_alloc_hashtable(struct idmap_hashtable *h)
++{
++ if (h->h_entries != NULL)
++ return;
++ h->h_entries = kcalloc(IDMAP_HASH_SZ,
++ sizeof(*h->h_entries),
++ GFP_KERNEL);
++}
++
++static void
++idmap_free_hashtable(struct idmap_hashtable *h)
++{
++ int i;
++
++ if (h->h_entries == NULL)
++ return;
++ for (i = 0; i < IDMAP_HASH_SZ; i++)
++ kfree(h->h_entries[i].ih_name);
++ kfree(h->h_entries);
++}
++
+ void
+ nfs_idmap_delete(struct nfs_client *clp)
+ {
+ struct idmap *idmap = clp->cl_idmap;
+- int i;
+
+ if (!idmap)
+ return;
+ rpc_unlink(idmap->idmap_dentry);
+ clp->cl_idmap = NULL;
+- for (i = 0; i < ARRAY_SIZE(idmap->idmap_user_hash.h_entries); i++)
+- kfree(idmap->idmap_user_hash.h_entries[i].ih_name);
+- for (i = 0; i < ARRAY_SIZE(idmap->idmap_group_hash.h_entries); i++)
+- kfree(idmap->idmap_group_hash.h_entries[i].ih_name);
++ idmap_free_hashtable(&idmap->idmap_user_hash);
++ idmap_free_hashtable(&idmap->idmap_group_hash);
+ kfree(idmap);
+ }
+
+@@ -401,6 +420,8 @@
+ static inline struct idmap_hashent *
+ idmap_name_hash(struct idmap_hashtable* h, const char *name, size_t len)
+ {
++ if (h->h_entries == NULL)
++ return NULL;
+ return &h->h_entries[fnvhash32(name, len) % IDMAP_HASH_SZ];
+ }
+
+@@ -409,6 +430,8 @@
+ {
+ struct idmap_hashent *he = idmap_name_hash(h, name, len);
+
++ if (he == NULL)
++ return NULL;
+ if (he->ih_namelen != len || memcmp(he->ih_name, name, len) != 0)
+ return NULL;
+ if (time_after(jiffies, he->ih_expires))
+@@ -419,6 +442,8 @@
+ static inline struct idmap_hashent *
+ idmap_id_hash(struct idmap_hashtable* h, __u32 id)
+ {
++ if (h->h_entries == NULL)
++ return NULL;
+ return &h->h_entries[fnvhash32(&id, sizeof(id)) % IDMAP_HASH_SZ];
+ }
+
+@@ -426,6 +451,9 @@
+ idmap_lookup_id(struct idmap_hashtable *h, __u32 id)
+ {
+ struct idmap_hashent *he = idmap_id_hash(h, id);
++
++ if (he == NULL)
++ return NULL;
+ if (he->ih_id != id || he->ih_namelen == 0)
+ return NULL;
+ if (time_after(jiffies, he->ih_expires))
+@@ -441,12 +469,14 @@
+ static inline struct idmap_hashent *
+ idmap_alloc_name(struct idmap_hashtable *h, char *name, size_t len)
+ {
++ idmap_alloc_hashtable(h);
+ return idmap_name_hash(h, name, len);
+ }
+
+ static inline struct idmap_hashent *
+ idmap_alloc_id(struct idmap_hashtable *h, __u32 id)
+ {
++ idmap_alloc_hashtable(h);
+ return idmap_id_hash(h, id);
+ }
+
Copied: dists/squeeze-backports/linux/debian/patches/bugfix/all/NFSv4-Reduce-the-footprint-of-the-idmapper.patch (from r19123, dists/sid/linux/debian/patches/bugfix/all/NFSv4-Reduce-the-footprint-of-the-idmapper.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/NFSv4-Reduce-the-footprint-of-the-idmapper.patch Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/bugfix/all/NFSv4-Reduce-the-footprint-of-the-idmapper.patch)
@@ -0,0 +1,62 @@
+From: Trond Myklebust <Trond.Myklebust at netapp.com>
+Date: Tue, 7 Feb 2012 14:59:05 -0500
+Subject: [1/2] NFSv4: Reduce the footprint of the idmapper
+
+commit d073e9b541e1ac3f52d72c3a153855d9a9ee3278 upstream.
+
+Instead of pre-allocating the storage for all the strings, we can
+significantly reduce the size of that table by doing the allocation
+when we do the downcall.
+
+Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
+Reviewed-by: Jeff Layton <jlayton at redhat.com>
+[bwh: Backported to 3.2: adjust context in nfs_idmap_delete()]
+---
+ fs/nfs/idmap.c | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+--- a/fs/nfs/idmap.c
++++ b/fs/nfs/idmap.c
+@@ -318,7 +318,7 @@
+ unsigned long ih_expires;
+ __u32 ih_id;
+ size_t ih_namelen;
+- char ih_name[IDMAP_NAMESZ];
++ const char *ih_name;
+ };
+
+ struct idmap_hashtable {
+@@ -382,11 +382,16 @@
+ nfs_idmap_delete(struct nfs_client *clp)
+ {
+ struct idmap *idmap = clp->cl_idmap;
++ int i;
+
+ if (!idmap)
+ return;
+ rpc_unlink(idmap->idmap_dentry);
+ clp->cl_idmap = NULL;
++ for (i = 0; i < ARRAY_SIZE(idmap->idmap_user_hash.h_entries); i++)
++ kfree(idmap->idmap_user_hash.h_entries[i].ih_name);
++ for (i = 0; i < ARRAY_SIZE(idmap->idmap_group_hash.h_entries); i++)
++ kfree(idmap->idmap_group_hash.h_entries[i].ih_name);
+ kfree(idmap);
+ }
+
+@@ -449,9 +454,14 @@
+ idmap_update_entry(struct idmap_hashent *he, const char *name,
+ size_t namelen, __u32 id)
+ {
++ char *str = kmalloc(namelen + 1, GFP_KERNEL);
++ if (str == NULL)
++ return;
++ kfree(he->ih_name);
+ he->ih_id = id;
+- memcpy(he->ih_name, name, namelen);
+- he->ih_name[namelen] = '\0';
++ memcpy(str, name, namelen);
++ str[namelen] = '\0';
++ he->ih_name = str;
+ he->ih_namelen = namelen;
+ he->ih_expires = jiffies + nfs_idmap_cache_timeout;
+ }
Modified: dists/squeeze-backports/linux/debian/patches/bugfix/all/cpu-Register-a-generic-CPU-device-on-architectures-t.patch
==============================================================================
--- dists/squeeze-backports/linux/debian/patches/bugfix/all/cpu-Register-a-generic-CPU-device-on-architectures-t.patch Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/cpu-Register-a-generic-CPU-device-on-architectures-t.patch Fri Jun 29 01:09:59 2012 (r19230)
@@ -19,7 +19,7 @@
---
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
-@@ -8,6 +8,7 @@ config FRV
+@@ -8,6 +8,7 @@
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
select ARCH_HAVE_NMI_SAFE_CMPXCHG
@@ -29,7 +29,7 @@
bool
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
-@@ -4,6 +4,7 @@ config H8300
+@@ -4,6 +4,7 @@
select HAVE_IDE
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
@@ -39,7 +39,7 @@
string
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
-@@ -6,6 +6,7 @@ config M68K
+@@ -7,6 +7,7 @@
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
@@ -49,7 +49,7 @@
bool
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
-@@ -17,6 +17,7 @@ config MICROBLAZE
+@@ -17,6 +17,7 @@
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW
@@ -59,7 +59,7 @@
def_bool n
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
-@@ -15,6 +15,7 @@ config OPENRISC
+@@ -15,6 +15,7 @@
select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW
select GENERIC_IOMAP
@@ -69,7 +69,7 @@
def_bool y
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
-@@ -4,6 +4,7 @@ config SCORE
+@@ -4,6 +4,7 @@
def_bool y
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
@@ -79,7 +79,7 @@
prompt "System type"
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
-@@ -8,6 +8,7 @@ config UML
+@@ -8,6 +8,7 @@
default y
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
@@ -89,7 +89,7 @@
bool
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
-@@ -9,6 +9,7 @@ config XTENSA
+@@ -9,6 +9,7 @@
select HAVE_IDE
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
@@ -99,7 +99,7 @@
primarily for embedded systems. These processors are both
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
-@@ -172,6 +172,10 @@ config SYS_HYPERVISOR
+@@ -172,6 +172,10 @@
bool
default n
@@ -109,7 +109,7 @@
+
source "drivers/base/regmap/Kconfig"
- config DMA_SHARED_BUFFER
+ endmenu
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -12,6 +12,7 @@
@@ -120,7 +120,7 @@
#include "base.h"
-@@ -248,11 +249,29 @@ bool cpu_is_hotpluggable(unsigned cpu)
+@@ -248,11 +249,29 @@
}
EXPORT_SYMBOL_GPL(get_cpu_sysdev);
Copied: dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-fix-offset-calculation-when-buildin.patch (from r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-fix-offset-calculation-when-buildin.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-fix-offset-calculation-when-buildin.patch Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-fix-offset-calculation-when-buildin.patch)
@@ -0,0 +1,61 @@
+From: Jason Wang <jasowang at redhat.com>
+Date: Wed, 2 May 2012 11:41:30 +0800
+Subject: [1/5] macvtap: zerocopy: fix offset calculation when building skb
+
+commit 3afc9621f15701c557e60f61eba9242bac2771dd upstream.
+
+This patch fixes the offset calculation when building skb:
+
+- offset1 were used as skb data offset not vector offset
+- reset offset to zero only when we advance to next vector
+
+Signed-off-by: Jason Wang <jasowang at redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
+---
+ drivers/net/macvtap.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
+index 0427c65..bd4a70d 100644
+--- a/drivers/net/macvtap.c
++++ b/drivers/net/macvtap.c
+@@ -505,10 +505,11 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
+ if (copy > size) {
+ ++from;
+ --count;
+- }
++ offset = 0;
++ } else
++ offset += size;
+ copy -= size;
+ offset1 += size;
+- offset = 0;
+ }
+
+ if (len == offset1)
+@@ -519,13 +520,13 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
+ int num_pages;
+ unsigned long base;
+
+- len = from->iov_len - offset1;
++ len = from->iov_len - offset;
+ if (!len) {
+- offset1 = 0;
++ offset = 0;
+ ++from;
+ continue;
+ }
+- base = (unsigned long)from->iov_base + offset1;
++ base = (unsigned long)from->iov_base + offset;
+ size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT;
+ num_pages = get_user_pages_fast(base, size, 0, &page[i]);
+ if ((num_pages != size) ||
+@@ -546,7 +547,7 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
+ len -= size;
+ i++;
+ }
+- offset1 = 0;
++ offset = 0;
+ ++from;
+ }
+ return 0;
Copied: dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-fix-truesize-underestimation.patch (from r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-fix-truesize-underestimation.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-fix-truesize-underestimation.patch Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-fix-truesize-underestimation.patch)
@@ -0,0 +1,41 @@
+From: Jason Wang <jasowang at redhat.com>
+Date: Wed, 2 May 2012 11:41:44 +0800
+Subject: [2/5] macvtap: zerocopy: fix truesize underestimation
+
+commit 4ef67ebedffa44ed9939b34708ac2fee06d2f65f upstream.
+
+As the skb fragment were pinned/built from user pages, we should
+account the page instead of length for truesize.
+
+Signed-off-by: Jason Wang <jasowang at redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
+---
+ drivers/net/macvtap.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
+index bd4a70d..7cb2684 100644
+--- a/drivers/net/macvtap.c
++++ b/drivers/net/macvtap.c
+@@ -519,6 +519,7 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
+ struct page *page[MAX_SKB_FRAGS];
+ int num_pages;
+ unsigned long base;
++ unsigned long truesize;
+
+ len = from->iov_len - offset;
+ if (!len) {
+@@ -533,10 +534,11 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
+ (num_pages > MAX_SKB_FRAGS - skb_shinfo(skb)->nr_frags))
+ /* put_page is in skb free */
+ return -EFAULT;
++ truesize = size * PAGE_SIZE;
+ skb->data_len += len;
+ skb->len += len;
+- skb->truesize += len;
+- atomic_add(len, &skb->sk->sk_wmem_alloc);
++ skb->truesize += truesize;
++ atomic_add(truesize, &skb->sk->sk_wmem_alloc);
+ while (len) {
+ int off = base & ~PAGE_MASK;
+ int size = min_t(int, len, PAGE_SIZE - off);
Copied: dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-put-page-when-fail-to-get-all-reque.patch (from r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-put-page-when-fail-to-get-all-reque.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-put-page-when-fail-to-get-all-reque.patch Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-put-page-when-fail-to-get-all-reque.patch)
@@ -0,0 +1,35 @@
+From: Jason Wang <jasowang at redhat.com>
+Date: Wed, 2 May 2012 11:41:58 +0800
+Subject: [3/5] macvtap: zerocopy: put page when fail to get all requested
+ user pages
+
+commit 02ce04bb3d28c3333231f43bca677228dbc686fe upstream.
+
+When get_user_pages_fast() fails to get all requested pages, we could not use
+kfree_skb() to free it as it has not been put in the skb fragments. So we need
+to call put_page() instead.
+
+Signed-off-by: Jason Wang <jasowang at redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
+---
+ drivers/net/macvtap.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
+index 7cb2684..9ab182a 100644
+--- a/drivers/net/macvtap.c
++++ b/drivers/net/macvtap.c
+@@ -531,9 +531,11 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
+ size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT;
+ num_pages = get_user_pages_fast(base, size, 0, &page[i]);
+ if ((num_pages != size) ||
+- (num_pages > MAX_SKB_FRAGS - skb_shinfo(skb)->nr_frags))
+- /* put_page is in skb free */
++ (num_pages > MAX_SKB_FRAGS - skb_shinfo(skb)->nr_frags)) {
++ for (i = 0; i < num_pages; i++)
++ put_page(page[i]);
+ return -EFAULT;
++ }
+ truesize = size * PAGE_SIZE;
+ skb->data_len += len;
+ skb->len += len;
Copied: dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-set-SKBTX_DEV_ZEROCOPY-only-when-sk.patch (from r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-set-SKBTX_DEV_ZEROCOPY-only-when-sk.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-set-SKBTX_DEV_ZEROCOPY-only-when-sk.patch Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-set-SKBTX_DEV_ZEROCOPY-only-when-sk.patch)
@@ -0,0 +1,48 @@
+From: Jason Wang <jasowang at redhat.com>
+Date: Wed, 2 May 2012 11:42:06 +0800
+Subject: [4/5] macvtap: zerocopy: set SKBTX_DEV_ZEROCOPY only when skb is
+ built successfully
+
+commit 01d6657b388438def19c8baaea28e742b6ed32ec upstream.
+
+Current the SKBTX_DEV_ZEROCOPY is set unconditionally after
+zerocopy_sg_from_iovec(), this would lead NULL pointer when macvtap
+fails to build zerocopy skb because destructor_arg was not
+initialized. Solve this by set this flag after the skb were built
+successfully.
+
+Signed-off-by: Jason Wang <jasowang at redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
+---
+ drivers/net/macvtap.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
+index 9ab182a..a4ff694 100644
+--- a/drivers/net/macvtap.c
++++ b/drivers/net/macvtap.c
+@@ -699,10 +699,9 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
+ if (!skb)
+ goto err;
+
+- if (zerocopy) {
++ if (zerocopy)
+ err = zerocopy_sg_from_iovec(skb, iv, vnet_hdr_len, count);
+- skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY;
+- } else
++ else
+ err = skb_copy_datagram_from_iovec(skb, 0, iv, vnet_hdr_len,
+ len);
+ if (err)
+@@ -721,8 +720,10 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
+ rcu_read_lock_bh();
+ vlan = rcu_dereference_bh(q->vlan);
+ /* copy skb_ubuf_info for callback when skb has no error */
+- if (zerocopy)
++ if (zerocopy) {
+ skb_shinfo(skb)->destructor_arg = m->msg_control;
++ skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY;
++ }
+ if (vlan)
+ macvlan_start_xmit(skb, vlan->dev);
+ else
Copied: dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-validate-vectors-before-building-sk.patch (from r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-validate-vectors-before-building-sk.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/macvtap-zerocopy-validate-vectors-before-building-sk.patch Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/bugfix/all/macvtap-zerocopy-validate-vectors-before-building-sk.patch)
@@ -0,0 +1,78 @@
+From: Jason Wang <jasowang at redhat.com>
+Date: Wed, 2 May 2012 11:42:15 +0800
+Subject: macvtap: zerocopy: validate vectors before building skb
+
+commit b92946e2919134ebe2a4083e4302236295ea2a73 upstream.
+
+There're several reasons that the vectors need to be validated:
+
+- Return error when caller provides vectors whose num is greater than UIO_MAXIOV.
+- Linearize part of skb when userspace provides vectors grater than MAX_SKB_FRAGS.
+- Return error when userspace provides vectors whose total length may exceed
+- MAX_SKB_FRAGS * PAGE_SIZE.
+
+Signed-off-by: Jason Wang <jasowang at redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
+---
+ drivers/net/macvtap.c | 25 +++++++++++++++++++++----
+ 1 file changed, 21 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
+index a4ff694..163559c 100644
+--- a/drivers/net/macvtap.c
++++ b/drivers/net/macvtap.c
+@@ -529,9 +529,10 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
+ }
+ base = (unsigned long)from->iov_base + offset;
+ size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT;
++ if (i + size > MAX_SKB_FRAGS)
++ return -EMSGSIZE;
+ num_pages = get_user_pages_fast(base, size, 0, &page[i]);
+- if ((num_pages != size) ||
+- (num_pages > MAX_SKB_FRAGS - skb_shinfo(skb)->nr_frags)) {
++ if (num_pages != size) {
+ for (i = 0; i < num_pages; i++)
+ put_page(page[i]);
+ return -EFAULT;
+@@ -651,7 +652,7 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
+ int err;
+ struct virtio_net_hdr vnet_hdr = { 0 };
+ int vnet_hdr_len = 0;
+- int copylen;
++ int copylen = 0;
+ bool zerocopy = false;
+
+ if (q->flags & IFF_VNET_HDR) {
+@@ -680,15 +681,31 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
+ if (unlikely(len < ETH_HLEN))
+ goto err;
+
++ err = -EMSGSIZE;
++ if (unlikely(count > UIO_MAXIOV))
++ goto err;
++
+ if (m && m->msg_control && sock_flag(&q->sk, SOCK_ZEROCOPY))
+ zerocopy = true;
+
+ if (zerocopy) {
++ /* Userspace may produce vectors with count greater than
++ * MAX_SKB_FRAGS, so we need to linearize parts of the skb
++ * to let the rest of data to be fit in the frags.
++ */
++ if (count > MAX_SKB_FRAGS) {
++ copylen = iov_length(iv, count - MAX_SKB_FRAGS);
++ if (copylen < vnet_hdr_len)
++ copylen = 0;
++ else
++ copylen -= vnet_hdr_len;
++ }
+ /* There are 256 bytes to be copied in skb, so there is enough
+ * room for skb expand head in case it is used.
+ * The rest buffer is mapped from userspace.
+ */
+- copylen = vnet_hdr.hdr_len;
++ if (copylen < vnet_hdr.hdr_len)
++ copylen = vnet_hdr.hdr_len;
+ if (!copylen)
+ copylen = GOODCOPY_LEN;
+ } else
Copied: dists/squeeze-backports/linux/debian/patches/bugfix/all/net-sock-validate-data_len-before-allocating-skb-in-.patch (from r19123, dists/sid/linux/debian/patches/bugfix/all/net-sock-validate-data_len-before-allocating-skb-in-.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/all/net-sock-validate-data_len-before-allocating-skb-in-.patch Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/bugfix/all/net-sock-validate-data_len-before-allocating-skb-in-.patch)
@@ -0,0 +1,48 @@
+From: Jason Wang <jasowang at redhat.com>
+Date: Wed, 30 May 2012 21:18:10 +0000
+Subject: net: sock: validate data_len before allocating skb in
+ sock_alloc_send_pskb()
+
+commit cc9b17ad29ecaa20bfe426a8d4dbfb94b13ff1cc upstream.
+
+We need to validate the number of pages consumed by data_len, otherwise frags
+array could be overflowed by userspace. So this patch validate data_len and
+return -EMSGSIZE when data_len may occupies more frags than MAX_SKB_FRAGS.
+
+Signed-off-by: Jason Wang <jasowang at redhat.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ net/core/sock.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/net/core/sock.c b/net/core/sock.c
+index 653f8c0..9e5b71f 100644
+--- a/net/core/sock.c
++++ b/net/core/sock.c
+@@ -1592,6 +1592,11 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
+ gfp_t gfp_mask;
+ long timeo;
+ int err;
++ int npages = (data_len + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
++
++ err = -EMSGSIZE;
++ if (npages > MAX_SKB_FRAGS)
++ goto failure;
+
+ gfp_mask = sk->sk_allocation;
+ if (gfp_mask & __GFP_WAIT)
+@@ -1610,14 +1615,12 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
+ if (atomic_read(&sk->sk_wmem_alloc) < sk->sk_sndbuf) {
+ skb = alloc_skb(header_len, gfp_mask);
+ if (skb) {
+- int npages;
+ int i;
+
+ /* No pages, we're done... */
+ if (!data_len)
+ break;
+
+- npages = (data_len + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
+ skb->truesize += data_len;
+ skb_shinfo(skb)->nr_frags = npages;
+ for (i = 0; i < npages; i++) {
Copied: dists/squeeze-backports/linux/debian/patches/bugfix/x86/thp-avoid-atomic64_read-in-pmd_read_atomic-for-32bit-pae.patch (from r19123, dists/sid/linux/debian/patches/bugfix/x86/thp-avoid-atomic64_read-in-pmd_read_atomic-for-32bit-pae.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/bugfix/x86/thp-avoid-atomic64_read-in-pmd_read_atomic-for-32bit-pae.patch Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/bugfix/x86/thp-avoid-atomic64_read-in-pmd_read_atomic-for-32bit-pae.patch)
@@ -0,0 +1,112 @@
+From: Andrea Arcangeli <aarcange at redhat.com>
+Subject: thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE
+
+In the x86 32bit PAE CONFIG_TRANSPARENT_HUGEPAGE=y case while holding the
+mmap_sem for reading, cmpxchg8b cannot be used to read pmd contents under
+Xen.
+
+So instead of dealing only with "consistent" pmdvals in
+pmd_none_or_trans_huge_or_clear_bad() (which would be conceptually
+simpler) we let pmd_none_or_trans_huge_or_clear_bad() deal with pmdvals
+where the low 32bit and high 32bit could be inconsistent (to avoid having
+to use cmpxchg8b).
+
+The only guarantee we get from pmd_read_atomic is that if the low part of
+the pmd was found null, the high part will be null too (so the pmd will be
+considered unstable). And if the low part of the pmd is found "stable"
+later, then it means the whole pmd was read atomically (because after a
+pmd is stable, neither MADV_DONTNEED nor page faults can alter it anymore,
+and we read the high part after the low part).
+
+In the 32bit PAE x86 case, it is enough to read the low part of the pmdval
+atomically to declare the pmd as "stable" and that's true for THP and no
+THP, furthermore in the THP case we also have a barrier() that will
+prevent any inconsistent pmdvals to be cached by a later re-read of the
+*pmd.
+
+Signed-off-by: Andrea Arcangeli <aarcange at redhat.com>
+Cc: Jonathan Nieder <jrnieder at gmail.com>
+Cc: Ulrich Obergfell <uobergfe at redhat.com>
+Cc: Mel Gorman <mgorman at suse.de>
+Cc: Hugh Dickins <hughd at google.com>
+Cc: Larry Woodman <lwoodman at redhat.com>
+Cc: Petr Matousek <pmatouse at redhat.com>
+Cc: Rik van Riel <riel at redhat.com>
+Cc: Jan Beulich <jbeulich at suse.com>
+Cc: KOSAKI Motohiro <kosaki.motohiro at gmail.com>
+Cc: <stable at vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+---
+
+ arch/x86/include/asm/pgtable-3level.h | 30 +++++++++++++-----------
+ include/asm-generic/pgtable.h | 10 ++++++++
+ 2 files changed, 27 insertions(+), 13 deletions(-)
+
+--- a/arch/x86/include/asm/pgtable-3level.h
++++ b/arch/x86/include/asm/pgtable-3level.h
+@@ -47,16 +47,26 @@
+ * they can run pmd_offset_map_lock or pmd_trans_huge or other pmd
+ * operations.
+ *
+- * Without THP if the mmap_sem is hold for reading, the
+- * pmd can only transition from null to not null while pmd_read_atomic runs.
+- * So there's no need of literally reading it atomically.
++ * Without THP if the mmap_sem is hold for reading, the pmd can only
++ * transition from null to not null while pmd_read_atomic runs. So
++ * we can always return atomic pmd values with this function.
+ *
+ * With THP if the mmap_sem is hold for reading, the pmd can become
+- * THP or null or point to a pte (and in turn become "stable") at any
+- * time under pmd_read_atomic, so it's mandatory to read it atomically
+- * with cmpxchg8b.
++ * trans_huge or none or point to a pte (and in turn become "stable")
++ * at any time under pmd_read_atomic. We could read it really
++ * atomically here with a atomic64_read for the THP enabled case (and
++ * it would be a whole lot simpler), but to avoid using cmpxchg8b we
++ * only return an atomic pmdval if the low part of the pmdval is later
++ * found stable (i.e. pointing to a pte). And we're returning a none
++ * pmdval if the low part of the pmd is none. In some cases the high
++ * and low part of the pmdval returned may not be consistent if THP is
++ * enabled (the low part may point to previously mapped hugepage,
++ * while the high part may point to a more recently mapped hugepage),
++ * but pmd_none_or_trans_huge_or_clear_bad() only needs the low part
++ * of the pmd to be read atomically to decide if the pmd is unstable
++ * or not, with the only exception of when the low part of the pmd is
++ * zero in which case we return a none pmd.
+ */
+-#ifndef CONFIG_TRANSPARENT_HUGEPAGE
+ static inline pmd_t pmd_read_atomic(pmd_t *pmdp)
+ {
+ pmdval_t ret;
+@@ -74,12 +84,6 @@
+
+ return (pmd_t) { ret };
+ }
+-#else /* CONFIG_TRANSPARENT_HUGEPAGE */
+-static inline pmd_t pmd_read_atomic(pmd_t *pmdp)
+-{
+- return (pmd_t) { atomic64_read((atomic64_t *)pmdp) };
+-}
+-#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
+
+ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
+ {
+--- a/include/asm-generic/pgtable.h
++++ b/include/asm-generic/pgtable.h
+@@ -484,6 +484,16 @@
+ /*
+ * The barrier will stabilize the pmdval in a register or on
+ * the stack so that it will stop changing under the code.
++ *
++ * When CONFIG_TRANSPARENT_HUGEPAGE=y on x86 32bit PAE,
++ * pmd_read_atomic is allowed to return a not atomic pmdval
++ * (for example pointing to an hugepage that has never been
++ * mapped in the pmd). The below checks will only care about
++ * the low part of the pmd with 32bit PAE x86 anyway, with the
++ * exception of pmd_none(). So the important thing is that if
++ * the low part of the pmd is found null, the high part will
++ * be also null or the pmd_none() check below would be
++ * confused.
+ */
+ #ifdef CONFIG_TRANSPARENT_HUGEPAGE
+ barrier();
Modified: dists/squeeze-backports/linux/debian/patches/debian/arch-sh4-fix-uimage-build.patch
==============================================================================
--- dists/squeeze-backports/linux/debian/patches/debian/arch-sh4-fix-uimage-build.patch Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/patches/debian/arch-sh4-fix-uimage-build.patch Fri Jun 29 01:09:59 2012 (r19230)
@@ -1,5 +1,5 @@
---- a/arch/sh/Makefile 2009-12-03 12:51:21.000000000 +0900
-+++ b/arch/sh/Makefile 2010-02-04 15:47:57.000000000 +0900
+--- a/arch/sh/Makefile
++++ b/arch/sh/Makefile
@@ -75,7 +75,6 @@
# Give the various platforms the opportunity to set default image types
@@ -7,4 +7,4 @@
-defaultimage-$(CONFIG_SH_SH7785LCR) := uImage
defaultimage-$(CONFIG_SH_RSK) := uImage
defaultimage-$(CONFIG_SH_URQUELL) := uImage
- defaultimage-$(CONFIG_SH_7206_SOLUTION_ENGINE) := vmlinux
+ defaultimage-$(CONFIG_SH_MIGOR) := uImage
Copied: dists/squeeze-backports/linux/debian/patches/debian/avoid-ABI-change-for-hidepid.patch (from r19123, dists/sid/linux/debian/patches/debian/avoid-ABI-change-for-hidepid.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/debian/avoid-ABI-change-for-hidepid.patch Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/debian/avoid-ABI-change-for-hidepid.patch)
@@ -0,0 +1,16 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: Avoid ABI change for hidepid
+
+--- a/include/linux/pid_namespace.h
++++ b/include/linux/pid_namespace.h
+@@ -30,8 +30,10 @@
+ #ifdef CONFIG_BSD_PROCESS_ACCT
+ struct bsd_acct_struct *bacct;
+ #endif
++#ifndef __GENKSYMS__
+ gid_t pid_gid;
+ int hide_pid;
++#endif
+ };
+
+ extern struct pid_namespace init_pid_ns;
Modified: dists/squeeze-backports/linux/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch
==============================================================================
--- dists/squeeze-backports/linux/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch Fri Jun 29 01:09:59 2012 (r19230)
@@ -12,12 +12,10 @@
drivers/net/wireless/brcm80211/Kconfig | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
-diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
-index 1b51d8b..1f43cd4 100644
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
-@@ -225,11 +225,13 @@ static void bcma_host_pci_remove(struct pci_dev *dev)
- }
+@@ -263,11 +263,13 @@
+ #endif /* CONFIG_PM */
static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
+#if !IS_ENABLED(CONFIG_BRCMSMAC)
@@ -31,11 +29,9 @@
{ 0, },
};
MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);
-diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig
-index 2069fc8..d5784ee 100644
--- a/drivers/net/wireless/brcm80211/Kconfig
+++ b/drivers/net/wireless/brcm80211/Kconfig
-@@ -5,7 +5,6 @@ config BRCMSMAC
+@@ -5,7 +5,6 @@
tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"
depends on PCI
depends on MAC80211
@@ -43,6 +39,3 @@
select BRCMUTIL
select FW_LOADER
select CRC_CCITT
---
-1.7.7.3
-
Modified: dists/squeeze-backports/linux/debian/patches/debian/kernelvariables.patch
==============================================================================
--- dists/squeeze-backports/linux/debian/patches/debian/kernelvariables.patch Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/patches/debian/kernelvariables.patch Fri Jun 29 01:09:59 2012 (r19230)
@@ -13,8 +13,8 @@
--- a/Makefile
+++ b/Makefile
-@@ -198,46 +198,6 @@
- CROSS_COMPILE ?=
+@@ -195,46 +195,6 @@
+ ARCH ?= $(SUBARCH)
CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)
-# Architecture as present in compile.h
@@ -60,7 +60,7 @@
KCONFIG_CONFIG ?= .config
export KCONFIG_CONFIG
-@@ -354,6 +314,44 @@ LDFLAGS_MODULE =
+@@ -354,6 +314,44 @@
AFLAGS_KERNEL =
CFLAGS_GCOV = -fprofile-arcs -ftest-coverage
Copied: dists/squeeze-backports/linux/debian/patches/debian/net-restore-skb_set_dev-removed-in-3.2.20.patch (from r19123, 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/squeeze-backports/linux/debian/patches/debian/net-restore-skb_set_dev-removed-in-3.2.20.patch Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/debian/net-restore-skb_set_dev-removed-in-3.2.20.patch)
@@ -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/squeeze-backports/linux/debian/patches/debian/version.patch
==============================================================================
--- dists/squeeze-backports/linux/debian/patches/debian/version.patch Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/patches/debian/version.patch Fri Jun 29 01:09:59 2012 (r19230)
@@ -22,7 +22,7 @@
--- a/init/version.c
+++ b/init/version.c
-@@ -36,12 +36,31 @@ struct uts_namespace init_uts_ns = {
+@@ -37,12 +37,31 @@
};
EXPORT_SYMBOL_GPL(init_uts_ns);
@@ -59,7 +59,7 @@
" (" LINUX_COMPILER ") %s\n";
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
-@@ -73,7 +73,25 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
+@@ -73,8 +73,26 @@
echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
@@ -87,3 +87,4 @@
+ fi
echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
+ ) > .tmpcompile
Copied: dists/squeeze-backports/linux/debian/patches/features/all/define-netdev_features_t.patch (from r19123, dists/sid/linux/debian/patches/features/all/define-netdev_features_t.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/features/all/define-netdev_features_t.patch Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/features/all/define-netdev_features_t.patch)
@@ -0,0 +1,18 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: Define netdev_features_t
+
+This was done in upstream commit
+c8f44affb7244f2ac3e703cab13d55ede27621bb, but we just want the type
+definition for use by backported drivers rather than changing
+everything to use it.
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -950,6 +950,8 @@
+ u32 features);
+ };
+
++typedef u32 netdev_features_t;
++
+ /*
+ * The DEVICE structure.
+ * Actually, this whole structure is a big mistake. It mixes I/O
Copied: dists/squeeze-backports/linux/debian/patches/features/all/filter-Allow-to-create-sk-unattached-filters.patch (from r19123, dists/sid/linux/debian/patches/features/all/filter-Allow-to-create-sk-unattached-filters.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/features/all/filter-Allow-to-create-sk-unattached-filters.patch Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/features/all/filter-Allow-to-create-sk-unattached-filters.patch)
@@ -0,0 +1,120 @@
+From: Jiri Pirko <jpirko at redhat.com>
+Date: Sat, 31 Mar 2012 11:01:19 +0000
+Subject: filter: Allow to create sk-unattached filters
+
+commit 302d663740cfaf2c364df6bb61cd339014ed714c upstream.
+
+Today, BPF filters are bind to sockets. Since BPF machine becomes handy
+for other purposes, this patch allows to create unattached filter.
+
+Signed-off-by: Jiri Pirko <jpirko at redhat.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ include/linux/filter.h | 3 +++
+ net/core/filter.c | 66 +++++++++++++++++++++++++++++++++++++++++++++---
+ 2 files changed, 65 insertions(+), 4 deletions(-)
+
+diff --git a/include/linux/filter.h b/include/linux/filter.h
+index 8eeb205..92dd993 100644
+--- a/include/linux/filter.h
++++ b/include/linux/filter.h
+@@ -153,6 +153,9 @@ static inline unsigned int sk_filter_len(const struct sk_filter *fp)
+ extern int sk_filter(struct sock *sk, struct sk_buff *skb);
+ extern unsigned int sk_run_filter(const struct sk_buff *skb,
+ const struct sock_filter *filter);
++extern int sk_unattached_filter_create(struct sk_filter **pfp,
++ struct sock_fprog *fprog);
++extern void sk_unattached_filter_destroy(struct sk_filter *fp);
+ extern int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);
+ extern int sk_detach_filter(struct sock *sk);
+ extern int sk_chk_filter(struct sock_filter *filter, unsigned int flen);
+diff --git a/net/core/filter.c b/net/core/filter.c
+index 5dea452..cfbea88 100644
+--- a/net/core/filter.c
++++ b/net/core/filter.c
+@@ -587,6 +587,67 @@ void sk_filter_release_rcu(struct rcu_head *rcu)
+ }
+ EXPORT_SYMBOL(sk_filter_release_rcu);
+
++static int __sk_prepare_filter(struct sk_filter *fp)
++{
++ int err;
++
++ fp->bpf_func = sk_run_filter;
++
++ err = sk_chk_filter(fp->insns, fp->len);
++ if (err)
++ return err;
++
++ bpf_jit_compile(fp);
++ return 0;
++}
++
++/**
++ * sk_unattached_filter_create - create an unattached filter
++ * @fprog: the filter program
++ * @sk: the socket to use
++ *
++ * Create a filter independent ofr any socket. We first run some
++ * sanity checks on it to make sure it does not explode on us later.
++ * If an error occurs or there is insufficient memory for the filter
++ * a negative errno code is returned. On success the return is zero.
++ */
++int sk_unattached_filter_create(struct sk_filter **pfp,
++ struct sock_fprog *fprog)
++{
++ struct sk_filter *fp;
++ unsigned int fsize = sizeof(struct sock_filter) * fprog->len;
++ int err;
++
++ /* Make sure new filter is there and in the right amounts. */
++ if (fprog->filter == NULL)
++ return -EINVAL;
++
++ fp = kmalloc(fsize + sizeof(*fp), GFP_KERNEL);
++ if (!fp)
++ return -ENOMEM;
++ memcpy(fp->insns, fprog->filter, fsize);
++
++ atomic_set(&fp->refcnt, 1);
++ fp->len = fprog->len;
++
++ err = __sk_prepare_filter(fp);
++ if (err)
++ goto free_mem;
++
++ *pfp = fp;
++ return 0;
++free_mem:
++ kfree(fp);
++ return err;
++}
++EXPORT_SYMBOL_GPL(sk_unattached_filter_create);
++
++void sk_unattached_filter_destroy(struct sk_filter *fp)
++{
++ sk_filter_release(fp);
++}
++EXPORT_SYMBOL_GPL(sk_unattached_filter_destroy);
++
+ /**
+ * sk_attach_filter - attach a socket filter
+ * @fprog: the filter program
+@@ -617,16 +678,13 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
+
+ atomic_set(&fp->refcnt, 1);
+ fp->len = fprog->len;
+- fp->bpf_func = sk_run_filter;
+
+- err = sk_chk_filter(fp->insns, fp->len);
++ err = __sk_prepare_filter(fp);
+ if (err) {
+ sk_filter_uncharge(sk, fp);
+ return err;
+ }
+
+- bpf_jit_compile(fp);
+-
+ old_fp = rcu_dereference_protected(sk->sk_filter,
+ sock_owned_by_user(sk));
+ rcu_assign_pointer(sk->sk_filter, fp);
Modified: dists/squeeze-backports/linux/debian/patches/features/all/rt/check-series
==============================================================================
--- dists/squeeze-backports/linux/debian/patches/features/all/rt/check-series Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/patches/features/all/rt/check-series Fri Jun 29 01:09:59 2012 (r19230)
@@ -1,16 +1,13 @@
#! /bin/sh
-debian_series="$(mktemp)"
+debian_series=debian/patches/series-rt
rt_series="$(mktemp)"
-trap 'rm "$debian_series" "$rt_series"' INT QUIT EXIT
-
-# Pick all featureset=rt patches
-grep "featureset=rt$" debian/patches/series/base-extra > "$debian_series"
+trap 'rm "$rt_series"' INT QUIT EXIT
# Remove comments and empty lines. Drop localversion patch as uname version
# shouldn't be touched. Reformat to match series format.
-sed -r -e 's/ *#.*//; /^$/d; /^....-(localversion\.patch|Linux-.*-REBASE)\.patch$/d; s,.*,+ features/all/rt/& featureset=rt,' "debian/patches/features/all/rt/series" > "$rt_series"
+sed -r -e 's/ *#.*//; /^$/d; /^....-(localversion\.patch|Linux-.*-REBASE)\.patch$/d; s,.*,features/all/rt/&,' "debian/patches/features/all/rt/series" > "$rt_series"
# removed lines are OK if the rt patch contains fixes that are applied on
# featureset=none kernels, too.
Copied: dists/squeeze-backports/linux/debian/patches/series (from r19123, dists/sid/linux/debian/patches/series)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/patches/series Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/patches/series)
@@ -0,0 +1,328 @@
+debian/version.patch
+debian/kernelvariables.patch
+debian/doc-build-parallel.patch
+
+features/all/drivers-media-dvb-usb-af9005-request_firmware.patch
+
+features/all/sound-pci-cs46xx-request_firmware.patch
+
+# Patches and source files from aufs3 repository, imported with
+# debian/patches/features/all/aufs3/gen-patch.
+features/all/aufs3/aufs3-base.patch
+features/all/aufs3/aufs3-standalone.patch
+features/all/aufs3/aufs3-kbuild.patch
+features/all/aufs3/aufs3-add.patch
+# mark as staging/crap
+features/all/aufs3/mark-as-staging.patch
+# fix added exports from security/device_cgroup.c
+features/all/aufs3/aufs3-fix-export-__devcgroup_inode_permission.patch
+
+bugfix/ia64/hardcode-arch-script-output.patch
+bugfix/mips/disable-advansys.patch
+bugfix/arm/disable-scsi_acard.patch
+debian/mips-disable-werror.patch
+bugfix/powerpc/lpar-console.patch
+
+debian/sysrq-mask.patch
+
+debian/arch-sh4-fix-uimage-build.patch
+
+debian/af_802154-Disable-auto-loading-as-mitigation-against.patch
+debian/rds-Disable-auto-loading-as-mitigation-against-local.patch
+debian/decnet-Disable-auto-loading-as-mitigation-against-lo.patch
+
+bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch
+features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch
+
+debian/sched-autogroup-disabled.patch
+#+ bugfix/all/rt2800-disable-powersaving-as-default.patch
+features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
+debian/cgroups-Document-the-Debian-memory-resource-controll.patch
+bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch
+features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch
+
+bugfix/arm/ixp4xx_iobe.patch
+
+debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch
+
+bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch
+
+features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch
+bugfix/all/cpu-Do-not-return-errors-from-cpu_dev_init-which-wil.patch
+bugfix/all/cpu-Register-a-generic-CPU-device-on-architectures-t.patch
+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-topdown-mmap.patch
+bugfix/alpha/alpha-add-io-read-write-16-32-be-functions.patch
+features/arm/ARM-kirkwood-6282A1.patch
+features/all/Input-ALPS-move-protocol-information-to-Documentatio.patch
+features/all/Input-ALPS-add-protocol-version-field-in-alps_model_.patch
+features/all/Input-ALPS-remove-assumptions-about-packet-size.patch
+features/all/Input-ALPS-add-support-for-protocol-versions-3-and-4.patch
+features/all/Input-ALPS-add-semi-MT-support-for-v3-protocol.patch
+bugfix/x86/KVM-nVMX-Add-KVM_REQ_IMMEDIATE_EXIT.patch
+bugfix/x86/KVM-nVMX-Fix-warning-causing-idt-vectoring-info-beha.patch
+
+features/all/hwmon-it87-Add-IT8728F-support.patch
+
+bugfix/x86/drm-i915-do-not-enable-RC6p-on-Sandy-Bridge.patch
+bugfix/x86/drm-i915-fix-operator-precedence-when-enabling-RC6p.patch
+
+features/all/fs-symlink-restrictions-on-sticky-directories.patch
+features/all/fs-symlink-restrictions-on-sticky-directories-fix-2.patch
+features/all/fs-hardlink-creation-restrictions.patch
+features/all/fs-hardlink-creation-restrictions-fix.patch
+features/all/fs-hardlink-creation-restriction-cleanup.patch
+bugfix/all/kbuild-do-not-check-for-ancient-modutils-tools.patch
+
+# Temporary, until the original change has been tested some more
+debian/revert-CIFS-Respect-negotiated-MaxMpxCount.patch
+
+# Update all Hyper-V drivers to 3.4-rc1 (no longer staging)
+features/x86/hyperv/0001-NLS-improve-UTF8-UTF16-string-conversion-routine.patch
+features/x86/hyperv/0002-HID-Move-the-hid-hyperv-driver-out-of-staging.patch
+features/x86/hyperv/0003-Staging-hv-storvsc-Use-mempools-to-allocate-struct-s.patch
+features/x86/hyperv/0004-Staging-hv-storvsc-Cleanup-error-handling-in-the-pro.patch
+features/x86/hyperv/0005-Staging-hv-storvsc-Fixup-the-error-when-processing-S.patch
+features/x86/hyperv/0006-Staging-hv-storvsc-Fix-error-handling-storvsc_host_r.patch
+features/x86/hyperv/0007-Staging-hv-storvsc-Use-the-accessor-function-shost_p.patch
+features/x86/hyperv/0008-Staging-hv-storvsc-Use-the-unlocked-version-queuecom.patch
+features/x86/hyperv/0009-Staging-hv-storvsc-use-the-macro-KBUILD_MODNAME.patch
+features/x86/hyperv/0010-Staging-hv-storvsc-Get-rid-of-an-unnecessary-forward.patch
+features/x86/hyperv/0011-Staging-hv-storvsc-Upgrade-the-vmstor-protocol-versi.patch
+features/x86/hyperv/0012-Staging-hv-storvsc-Support-hot-add-of-scsi-disks.patch
+features/x86/hyperv/0013-Staging-hv-storvsc-Support-hot-removing-of-scsi-devi.patch
+features/x86/hyperv/0014-staging-hv-Use-kmemdup-rather-than-duplicating-its-i.patch
+features/x86/hyperv/0015-Staging-hv-vmbus-Support-building-the-vmbus-driver-a.patch
+features/x86/hyperv/0016-hv-Add-Kconfig-menu-entry.patch
+features/x86/hyperv/0017-Staging-hv-mousevsc-Remove-the-mouse-driver-from-the.patch
+features/x86/hyperv/0018-staging-hv-move-hv_netvsc-out-of-staging-area.patch
+features/x86/hyperv/0019-net-hyperv-Fix-long-lines-in-netvsc.c.patch
+features/x86/hyperv/0020-net-hyperv-Add-support-for-promiscuous-mode-setting.patch
+features/x86/hyperv/0021-Staging-hv-storvsc-Disable-clustering.patch
+features/x86/hyperv/0022-Staging-hv-storvsc-Cleanup-storvsc_device_alloc.patch
+features/x86/hyperv/0023-Staging-hv-storvsc-Fix-a-bug-in-storvsc_command_comp.patch
+features/x86/hyperv/0024-Staging-hv-storvsc-Fix-a-bug-in-copy_from_bounce_buf.patch
+features/x86/hyperv/0025-Staging-hv-storvsc-Implement-per-device-memory-pools.patch
+features/x86/hyperv/0026-Staging-hv-update-TODO-file.patch
+features/x86/hyperv/0027-HID-hv_mouse-Properly-add-the-hid-device.patch
+features/x86/hyperv/0028-Staging-hv-storvsc-Fix-a-bug-in-create_bounce_buffer.patch
+features/x86/hyperv/0029-net-hyperv-Fix-the-stop-wake-queue-mechanism.patch
+features/x86/hyperv/0030-Drivers-hv-Fix-a-memory-leak.patch
+features/x86/hyperv/0031-Drivers-hv-Make-the-vmbus-driver-unloadable.patch
+features/x86/hyperv/0032-Drivers-hv-Get-rid-of-an-unnecessary-check-in-hv.c.patch
+features/x86/hyperv/0033-net-hyperv-Remove-unnecessary-kmap_atomic-in-netvsc-.patch
+features/x86/hyperv/0034-net-hyperv-Add-NETVSP-protocol-version-negotiation.patch
+features/x86/hyperv/0035-net-hyperv-Add-support-for-jumbo-frame-up-to-64KB.patch
+features/x86/hyperv/0036-net-hyperv-fix-possible-memory-leak-in-do_set_multic.patch
+features/x86/hyperv/0037-drivers-hv-Get-rid-of-some-unnecessary-code.patch
+features/x86/hyperv/0038-net-hyperv-rx_bytes-should-account-the-ether-header-.patch
+features/x86/hyperv/0039-HID-hyperv-Properly-disconnect-the-input-device.patch
+features/x86/hyperv/0040-net-hyperv-fix-the-issue-that-large-packets-be-dropp.patch
+features/x86/hyperv/0041-net-hyperv-Use-netif_tx_disable-instead-of-netif_sto.patch
+features/x86/hyperv/0042-net-hyperv-Fix-the-page-buffer-when-an-RNDIS-message.patch
+features/x86/hyperv/0043-drivers-hv-kvp-Add-cleanup-connector-defines.patch
+features/x86/hyperv/0044-drivers-hv-kvp-Move-the-contents-of-hv_kvp.h-to-hype.patch
+features/x86/hyperv/0045-net-hyperv-Convert-camel-cased-variables-in-rndis_fi.patch
+features/x86/hyperv/0046-net-hyperv-Correct-the-assignment-in-netvsc_recv_cal.patch
+features/x86/hyperv/0047-net-hyperv-Remove-the-unnecessary-memset-in-rndis_fi.patch
+features/x86/hyperv/0048-Staging-hv-storvsc-Cleanup-some-comments.patch
+features/x86/hyperv/0049-Staging-hv-storvsc-Cleanup-storvsc_probe.patch
+features/x86/hyperv/0050-Staging-hv-storvsc-Cleanup-storvsc_queuecommand.patch
+features/x86/hyperv/0051-Staging-hv-storvsc-Introduce-defines-for-srb-status-.patch
+features/x86/hyperv/0052-Staging-hv-storvsc-Cleanup-storvsc_host_reset_handle.patch
+features/x86/hyperv/0053-Staging-hv-storvsc-Move-and-cleanup-storvsc_remove.patch
+features/x86/hyperv/0054-Staging-hv-storvsc-Add-a-comment-to-explain-life-cyc.patch
+features/x86/hyperv/0055-Staging-hv-storvsc-Get-rid-of-the-on_io_completion-i.patch
+features/x86/hyperv/0056-Staging-hv-storvsc-Rename-the-context-field-in-hv_st.patch
+features/x86/hyperv/0057-Staging-hv-storvsc-Miscellaneous-cleanup-of-storvsc-.patch
+features/x86/hyperv/0058-Staging-hv-storvsc-Cleanup-the-code-for-generating-p.patch
+features/x86/hyperv/0059-Staging-hv-storvsc-Cleanup-some-protocol-related-con.patch
+features/x86/hyperv/0060-Staging-hv-storvsc-Get-rid-of-some-unused-defines.patch
+features/x86/hyperv/0061-Staging-hv-storvsc-Consolidate-the-request-structure.patch
+features/x86/hyperv/0062-Staging-hv-storvsc-Consolidate-all-the-wire-protocol.patch
+features/x86/hyperv/0063-drivers-hv-Cleanup-the-kvp-related-state-in-hyperv.h.patch
+features/x86/hyperv/0064-tools-hv-Use-hyperv.h-to-get-the-KVP-definitions.patch
+features/x86/hyperv/0065-drivers-hv-kvp-Cleanup-the-kernel-user-protocol.patch
+features/x86/hyperv/0066-drivers-hv-Increase-the-number-of-VCPUs-supported-in.patch
+features/x86/hyperv/0067-Staging-hv-storvsc-Move-the-storage-driver-out-of-th.patch
+features/x86/hyperv/0068-net-hyperv-Use-the-built-in-macro-KBUILD_MODNAME-for.patch
+features/x86/hyperv/0069-net-hyperv-Fix-data-corruption-in-rndis_filter_recei.patch
+features/x86/hyperv/0070-net-hyperv-Add-support-for-vlan-trunking-from-guests.patch
+features/x86/hyperv/0071-Drivers-hv-Add-new-message-types-to-enhance-KVP.patch
+features/x86/hyperv/0072-net-hyperv-fix-erroneous-NETDEV_TX_BUSY-use.patch
+features/x86/hyperv/0073-Drivers-hv-Support-the-newly-introduced-KVP-messages.patch
+features/x86/hyperv/0074-Tools-hv-Fully-support-the-new-KVP-verbs-in-the-user.patch
+features/x86/hyperv/0075-Tools-hv-Support-enumeration-from-all-the-pools.patch
+features/x86/hyperv/0076-net-hyperv-Fix-the-code-handling-tx-busy.patch
+features/x86/hyperv/0077-hv-remove-the-second-argument-of-k-un-map_atomic.patch
+features/x86/hyperv/0078-libata-add-a-host-flag-to-ignore-detected-ATA-device.patch
+features/x86/hyperv/0079-ata_piix-defer-disks-to-the-Hyper-V-drivers-by-defau.patch
+
+features/x86/efi-stub/0001-x86-Add-missing-bzImage-fields-to-struct-setup_heade.patch
+features/x86/efi-stub/0002-x86-Don-t-use-magic-strings-for-EFI-loader-signature.patch
+features/x86/efi-stub/0003-efi.h-Add-struct-definition-for-boot-time-services.patch
+features/x86/efi-stub/0004-efi.h-Add-efi_image_loaded_t.patch
+features/x86/efi-stub/0005-efi.h-Add-allocation-types-for-boottime-allocate_pag.patch
+features/x86/efi-stub/0006-efi.h-Add-graphics-protocol-guids.patch
+features/x86/efi-stub/0007-efi.h-Add-boottime-locate_handle-search-types.patch
+features/x86/efi-stub/0008-efi-Add-EFI-file-I-O-data-types.patch
+features/x86/efi-stub/0009-x86-efi-EFI-boot-stub-support.patch
+features/x86/efi-stub/0010-x86-efi-Break-up-large-initrd-reads.patch
+features/x86/efi-stub/0011-x86-efi-Fix-pointer-math-issue-in-handle_ramdisks.patch
+features/x86/efi-stub/0012-tools-include-Add-byteshift-headers-for-endian-acces.patch
+features/x86/efi-stub/0013-x86-mkpiggy-Don-t-open-code-put_unaligned_le32.patch
+features/x86/efi-stub/0014-x86-boot-Restrict-CFLAGS-for-hostprogs.patch
+features/x86/efi-stub/0015-x86-efi-Fix-endian-issues-and-unaligned-accesses.patch
+features/x86/efi-stub/0016-x86-boot-Correct-CFLAGS-for-hostprogs.patch
+features/x86/efi-stub/0017-x86-efi-Add-dedicated-EFI-stub-entry-point.patch
+
+bugfix/all/brcmsmac-INTERMEDIATE-but-not-AMPDU-only-when-tracin.patch
+bugfix/all/NFSv4-Rate-limit-the-state-manager-for-lock-reclaim-.patch
+
+# Temporary, until the next ABI bump
+debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch
+debian/nls-Avoid-ABI-change-from-improvement-to-utf8s_to_ut.patch
+debian/efi-avoid-ABI-change.patch
+debian/skbuff-avoid-ABI-change-in-3.2.17.patch
+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
+
+# Update wacom driver to 3.5ish
+features/all/wacom/0001-Input-wacom-cleanup-feature-report-for-bamboos.patch
+features/all/wacom/0002-Input-wacom-remove-unused-bamboo-HID-parsing.patch
+features/all/wacom/0003-Input-wacom-add-some-comments-to-wacom_parse_hid.patch
+features/all/wacom/0005-Input-wacom-read-3rd-gen-Bamboo-Touch-HID-data.patch
+features/all/wacom/0006-Input-wacom-3rd-gen-Bamboo-P-Touch-packet-support.patch
+features/all/wacom/0007-Input-wacom-ignore-unwanted-bamboo-packets.patch
+features/all/wacom/0008-Input-wacom-add-support-for-Cintiq-24HD.patch
+features/all/wacom/0009-Input-wacom-add-LED-support-for-Cintiq-24HD.patch
+features/all/wacom/0010-Input-wacom-use-BTN_TOOL_FINGER-to-indicate-touch-de.patch
+features/all/wacom/0011-Input-wacom-use-switch-statement-for-wacom_tpc_irq.patch
+features/all/wacom/0012-Input-wacom-add-missing-LEDS_CLASS-to-Kconfig.patch
+features/all/wacom/0013-Input-wacom-fix-3rd-gen-Bamboo-MT-when-4-fingers-are.patch
+features/all/wacom/0014-Input-wacom-fix-physical-size-calculation-for-3rd-ge.patch
+features/all/wacom/0015-Input-wacom-isolate-input-registration.patch
+features/all/wacom/0016-Input-wacom-check-for-allocation-failure-in-probe.patch
+features/all/wacom/0017-Input-wacom-wireless-monitor-framework.patch
+features/all/wacom/0018-Input-wacom-create-inputs-when-wireless-connect.patch
+features/all/wacom/0019-Input-wacom-wireless-battery-status.patch
+features/all/wacom/0020-Input-wacom-add-basic-Intuos5-support.patch
+features/all/wacom/0021-Input-wacom-add-Intuos5-Touch-Ring-ExpressKey-suppor.patch
+features/all/wacom/0022-Input-wacom-add-Intuos5-Touch-Ring-LED-support.patch
+features/all/wacom/0023-Input-wacom-add-Intuos5-multitouch-sensor-support.patch
+features/all/wacom/0024-Input-wacom-retrieve-maximum-number-of-touch-points.patch
+features/all/wacom/0025-Input-wacom-add-0xE5-MT-device-support.patch
+features/all/wacom/0026-Input-wacom-return-proper-error-if-usb_get_extra_des.patch
+
+# Add support for Ralink RT5392/RF5372 chipset
+features/all/rt2x00-add-debug-message-for-new-chipset.patch
+features/all/rt2x00-add-rt5372-chipset-support.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
+features/all/be2net/0003-be2net-stop-checking-the-UE-registers-after-an-EEH-e.patch
+features/all/be2net/0004-be2net-don-t-log-more-than-one-error-on-detecting-EE.patch
+features/all/be2net/0005-be2net-stop-issuing-FW-cmds-if-any-cmd-times-out.patch
+features/all/be2net/0006-be2net-Fix-TX-queue-create-for-Lancer.patch
+features/all/be2net/0007-be2net-add-register-dump-feature-for-Lancer.patch
+features/all/be2net/0008-be2net-Add-EEPROM-dump-feature-for-Lancer.patch
+features/all/be2net/0009-be2net-Fix-VLAN-promiscous-mode-for-Lancer.patch
+features/all/be2net/0010-be2net-Use-V1-query-link-status-command-for-lancer.patch
+features/all/be2net/0011-be2net-Move-to-new-SR-IOV-implementation-in-Lancer.patch
+features/all/be2net/0012-be2net-Fix-error-recovery-paths.patch
+features/all/be2net/0013-be2net-Add-error-handling-for-Lancer.patch
+features/all/be2net/0014-be2net-Use-new-hash-key.patch
+features/all/be2net/0015-be2net-Fix-non-utilization-of-RX-queues.patch
+features/all/be2net/0016-be2net-netpoll-support.patch
+features/all/be2net/0017-be2net-update-some-counters-to-display-via-ethtool.patch
+features/all/be2net/0018-be2net-workaround-to-fix-a-bug-in-BE.patch
+features/all/be2net/0019-be2net-fix-ethtool-ringparam-reporting.patch
+features/all/be2net/0020-be2net-refactor-cleanup-vf-configuration-code.patch
+features/all/be2net/0021-be2net-Add-support-for-Skyhawk-cards.patch
+features/all/be2net/0022-be2net-Fix-INTx-processing-for-Lancer.patch
+features/all/be2net/0023-be2net-fix-be_vlan_add-rem_vid.patch
+features/all/be2net/0024-be2net-fix-range-check-for-set_qos-for-a-VF.patch
+features/all/be2net/0025-be2net-query-link-status-in-be_open.patch
+features/all/be2net/0026-netdev-make-net_device_ops-const.patch
+features/all/be2net/0027-be2net-create-RSS-rings-even-in-multi-channel-config.patch
+features/all/be2net/0028-be2net-allocate-more-headroom-in-incoming-skbs.patch
+features/all/be2net/0029-be2net-add-descriptions-for-stat-counters-reported-v.patch
+features/all/be2net/0030-be2net-Fix-link-status-query-command.patch
+features/all/be2net/0031-be2net-Use-new-implementation-of-get-mac-list-comman.patch
+features/all/be2net/0032-be2net-event-queue-re-design.patch
+features/all/be2net/0033-be2net-cancel-be_worker-during-EEH-recovery.patch
+features/all/be2net/0034-be2net-fix-tx-completion-cleanup.patch
+features/all/be2net/0035-be2net-reset-queue-address-after-freeing.patch
+features/all/be2net/0036-be2net-enable-RSS-for-ipv6-pkts.patch
+features/all/be2net/0037-be2net-update-driver-version.patch
+features/all/be2net/0038-be2net-Remove-unused-OFFSET_IN_PAGE-macro.patch
+features/all/be2net/0039-be2net-enable-WOL-by-default-if-h-w-supports-it.patch
+features/all/be2net/0040-be2net-Program-secondary-UC-MAC-address-into-MAC-fil.patch
+features/all/be2net/0041-be2net-Fix-number-of-vlan-slots-in-flex-mode.patch
+features/all/be2net/0042-be2net-fix-programming-of-VLAN-tags-for-VF.patch
+features/all/be2net/0043-be2net-fix-ethtool-get-settings.patch
+features/all/be2net/0044-be2net-Fix-VLAN-multicast-packet-reception.patch
+features/all/be2net/0045-be2net-Fix-FW-download-in-Lancer.patch
+features/all/be2net/0046-be2net-Fix-ethtool-self-test-for-Lancer.patch
+features/all/be2net/0047-be2net-Fix-traffic-stall-INTx-mode.patch
+features/all/be2net/0048-be2net-Fix-Lancer-statistics.patch
+features/all/be2net/0049-be2net-Fix-wrong-status-getting-returned-for-MCC-com.patch
+features/all/be2net/0050-be2net-Fix-FW-download-for-BE.patch
+features/all/be2net/0051-be2net-Ignore-status-of-some-ioctls-during-driver-lo.patch
+features/all/be2net/0052-be2net-fix-speed-displayed-by-ethtool-on-certain-SKU.patch
+features/all/be2net/0053-be2net-update-the-driver-version.patch
+features/all/be2net/0054-be2net-Fix-to-not-set-link-speed-for-disabled-functi.patch
+features/all/be2net/0055-be2net-Fix-to-apply-duplex-value-as-unknown-when-lin.patch
+features/all/be2net/0056-be2net-Record-receive-queue-index-in-skb-to-aid-RPS.patch
+features/all/be2net/0057-be2net-Fix-EEH-error-reset-before-a-flash-dump-compl.patch
+features/all/be2net/0058-be2net-avoid-disabling-sriov-while-VFs-are-assigned.patch
+
+# Add CoDel from 3.5, and prerequisites
+features/all/net-introduce-skb_flow_dissect.patch
+features/all/flow_dissector-use-a-64bit-load-store.patch
+features/all/net-flow_dissector.c-missing-include-linux-export.h.patch
+features/all/codel/0001-codel-Controlled-Delay-AQM.patch
+features/all/codel/0002-codel-use-Newton-method-instead-of-sqrt-and-divides.patch
+features/all/codel/0003-fq_codel-Fair-Queue-Codel-AQM.patch
+features/all/codel/0004-net-codel-Add-missing-include-linux-prefetch.h.patch
+features/all/codel/0005-net-codel-fix-build-errors.patch
+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
+
+# 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/hugepages-fix-use-after-free-bug-in-quota-handling.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
+
+# procfs hidepid from 3.4
+features/all/hidepid/0001-procfs-parse-mount-options.patch
+features/all/hidepid/0002-procfs-add-hidepid-and-gid-mount-options.patch
+features/all/hidepid/0003-proc-fix-null-pointer-deref-in-proc_pid_permission.patch
+features/all/hidepid/0004-proc-fix-mount-t-proc-o-AAA.patch
+# Temporary, until the next ABI bump
+debian/avoid-ABI-change-for-hidepid.patch
+
+bugfix/all/NFSv4-Reduce-the-footprint-of-the-idmapper.patch
+bugfix/all/NFSv4-Further-reduce-the-footprint-of-the-idmapper.patch
+bugfix/all/net-sock-validate-data_len-before-allocating-skb-in-.patch
+
+bugfix/all/macvtap-zerocopy-fix-offset-calculation-when-buildin.patch
+bugfix/all/macvtap-zerocopy-fix-truesize-underestimation.patch
+bugfix/all/macvtap-zerocopy-put-page-when-fail-to-get-all-reque.patch
+bugfix/all/macvtap-zerocopy-set-SKBTX_DEV_ZEROCOPY-only-when-sk.patch
+bugfix/all/macvtap-zerocopy-validate-vectors-before-building-sk.patch
+
+bugfix/all/KVM-Fix-buffer-overflow-in-kvm_set_irq.patch
Modified: dists/squeeze-backports/linux/debian/patches/series-rt
==============================================================================
--- dists/squeeze-backports/linux/debian/patches/series-rt Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/patches/series-rt Fri Jun 29 01:09:59 2012 (r19230)
@@ -1,266 +1,266 @@
-+ features/all/rt/0001-x86-Call-idle-notifier-after-irq_enter.patch
-+ features/all/rt/0002-slab-lockdep-Annotate-all-slab-caches.patch
-+ features/all/rt/0003-x86-kprobes-Remove-remove-bogus-preempt_enable.patch
-+ features/all/rt/0004-x86-hpet-Disable-MSI-on-Lenovo-W510.patch
-+ features/all/rt/0005-block-Shorten-interrupt-disabled-regions.patch
-+ features/all/rt/0006-sched-Distangle-worker-accounting-from-rq-3Elock.patch
-+ features/all/rt/0007-mips-enable-interrupts-in-signal.patch.patch
-+ features/all/rt/0008-arm-enable-interrupts-in-signal-code.patch.patch
-+ features/all/rt/0009-powerpc-85xx-Mark-cascade-irq-IRQF_NO_THREAD.patch
-+ features/all/rt/0010-powerpc-wsp-Mark-opb-cascade-handler-IRQF_NO_THREAD.patch
-+ features/all/rt/0011-powerpc-Mark-IPI-interrupts-IRQF_NO_THREAD.patch
-+ features/all/rt/0012-powerpc-Allow-irq-threading.patch
-+ features/all/rt/0013-sched-Keep-period-timer-ticking-when-throttling-acti.patch
-+ features/all/rt/0014-sched-Do-not-throttle-due-to-PI-boosting.patch
-+ features/all/rt/0015-time-Remove-bogus-comments.patch
-+ features/all/rt/0016-x86-vdso-Remove-bogus-locking-in-update_vsyscall_tz.patch
-+ features/all/rt/0017-x86-vdso-Use-seqcount-instead-of-seqlock.patch
-+ features/all/rt/0018-ia64-vsyscall-Use-seqcount-instead-of-seqlock.patch
-+ features/all/rt/0019-seqlock-Remove-unused-functions.patch
-+ features/all/rt/0020-seqlock-Use-seqcount.patch
-+ features/all/rt/0021-vfs-fs_struct-Move-code-out-of-seqcount-write-sectio.patch
-+ features/all/rt/0022-timekeeping-Split-xtime_lock.patch
-+ features/all/rt/0023-intel_idle-Convert-i7300_idle_lock-to-raw-spinlock.patch
-+ features/all/rt/0024-mm-memcg-shorten-preempt-disabled-section-around-eve.patch
-+ features/all/rt/0025-tracing-Account-for-preempt-off-in-preempt_schedule.patch
-+ features/all/rt/0026-signal-revert-ptrace-preempt-magic.patch.patch
-+ features/all/rt/0027-arm-Mark-pmu-interupt-IRQF_NO_THREAD.patch
-+ features/all/rt/0028-arm-Allow-forced-irq-threading.patch
-+ features/all/rt/0029-preempt-rt-Convert-arm-boot_lock-to-raw.patch
-+ features/all/rt/0030-sched-Create-schedule_preempt_disabled.patch
-+ features/all/rt/0031-sched-Use-schedule_preempt_disabled.patch
-+ features/all/rt/0032-signals-Do-not-wakeup-self.patch
-+ features/all/rt/0033-posix-timers-Prevent-broadcast-signals.patch
-+ features/all/rt/0034-signals-Allow-rt-tasks-to-cache-one-sigqueue-struct.patch
-+ features/all/rt/0035-signal-x86-Delay-calling-signals-in-atomic.patch
-+ features/all/rt/0036-generic-Use-raw-local-irq-variant-for-generic-cmpxch.patch
-+ features/all/rt/0037-drivers-random-Reduce-preempt-disabled-region.patch
-+ features/all/rt/0038-ARM-AT91-PIT-Remove-irq-handler-when-clock-event-is-.patch
-+ features/all/rt/0039-clocksource-TCLIB-Allow-higher-clock-rates-for-clock.patch
-+ features/all/rt/0040-drivers-net-tulip_remove_one-needs-to-call-pci_disab.patch
-+ features/all/rt/0041-drivers-net-Use-disable_irq_nosync-in-8139too.patch
-+ features/all/rt/0042-drivers-net-ehea-Make-rx-irq-handler-non-threaded-IR.patch
-+ features/all/rt/0043-drivers-net-at91_ether-Make-mdio-protection-rt-safe.patch
-+ features/all/rt/0044-preempt-mark-legitimated-no-resched-sites.patch.patch
-+ features/all/rt/0045-mm-Prepare-decoupling-the-page-fault-disabling-logic.patch
-+ features/all/rt/0046-mm-Fixup-all-fault-handlers-to-check-current-pagefau.patch
-+ features/all/rt/0047-mm-pagefault_disabled.patch
-+ features/all/rt/0048-mm-raw_pagefault_disable.patch
-+ features/all/rt/0049-filemap-fix-up.patch.patch
-+ features/all/rt/0050-mm-Remove-preempt-count-from-pagefault-disable-enabl.patch
-+ features/all/rt/0051-x86-highmem-Replace-BUG_ON-by-WARN_ON.patch
-+ features/all/rt/0052-suspend-Prevent-might-sleep-splats.patch
-+ features/all/rt/0053-OF-Fixup-resursive-locking-code-paths.patch
-+ features/all/rt/0054-of-convert-devtree-lock.patch.patch
-+ features/all/rt/0055-list-add-list-last-entry.patch.patch
-+ features/all/rt/0056-mm-page-alloc-use-list-last-entry.patch.patch
-+ features/all/rt/0057-mm-slab-move-debug-out.patch.patch
-+ features/all/rt/0058-rwsem-inlcude-fix.patch.patch
-+ features/all/rt/0059-sysctl-include-fix.patch.patch
-+ features/all/rt/0060-net-flip-lock-dep-thingy.patch.patch
-+ features/all/rt/0061-softirq-thread-do-softirq.patch.patch
-+ features/all/rt/0062-softirq-split-out-code.patch.patch
-+ features/all/rt/0063-x86-Do-not-unmask-io_apic-when-interrupt-is-in-progr.patch
-+ features/all/rt/0064-x86-32-fix-signal-crap.patch.patch
-+ features/all/rt/0065-x86-Do-not-disable-preemption-in-int3-on-32bit.patch
-+ features/all/rt/0066-rcu-Reduce-lock-section.patch
-+ features/all/rt/0067-locking-various-init-fixes.patch.patch
-+ features/all/rt/0068-wait-Provide-__wake_up_all_locked.patch
-+ features/all/rt/0069-pci-Use-__wake_up_all_locked-pci_unblock_user_cfg_ac.patch
-+ features/all/rt/0070-latency-hist.patch.patch
-+ features/all/rt/0071-hwlatdetect.patch.patch
-+ features/all/rt/0073-early-printk-consolidate.patch.patch
-+ features/all/rt/0074-printk-kill.patch.patch
-+ features/all/rt/0075-printk-force_early_printk-boot-param-to-help-with-de.patch
-+ features/all/rt/0076-rt-preempt-base-config.patch.patch
-+ features/all/rt/0077-bug-BUG_ON-WARN_ON-variants-dependend-on-RT-RT.patch
-+ features/all/rt/0078-rt-local_irq_-variants-depending-on-RT-RT.patch
-+ features/all/rt/0079-preempt-Provide-preempt_-_-no-rt-variants.patch
-+ features/all/rt/0080-ata-Do-not-disable-interrupts-in-ide-code-for-preemp.patch
-+ features/all/rt/0081-ide-Do-not-disable-interrupts-for-PREEMPT-RT.patch
-+ features/all/rt/0082-infiniband-Mellanox-IB-driver-patch-use-_nort-primit.patch
-+ features/all/rt/0083-input-gameport-Do-not-disable-interrupts-on-PREEMPT_.patch
-+ features/all/rt/0084-acpi-Do-not-disable-interrupts-on-PREEMPT_RT.patch
-+ features/all/rt/0085-core-Do-not-disable-interrupts-on-RT-in-kernel-users.patch
-+ features/all/rt/0086-core-Do-not-disable-interrupts-on-RT-in-res_counter..patch
-+ features/all/rt/0087-usb-Use-local_irq_-_nort-variants.patch
-+ features/all/rt/0088-tty-Do-not-disable-interrupts-in-put_ldisc-on-rt.patch
-+ features/all/rt/0089-mm-scatterlist-dont-disable-irqs-on-RT.patch
-+ features/all/rt/0090-signal-fix-up-rcu-wreckage.patch.patch
-+ features/all/rt/0091-net-wireless-warn-nort.patch.patch
-+ features/all/rt/0092-mm-Replace-cgroup_page-bit-spinlock.patch
-+ features/all/rt/0093-buffer_head-Replace-bh_uptodate_lock-for-rt.patch
-+ features/all/rt/0094-fs-jbd-jbd2-Make-state-lock-and-journal-head-lock-rt.patch
-+ features/all/rt/0095-genirq-Disable-DEBUG_SHIRQ-for-rt.patch
-+ features/all/rt/0096-genirq-Disable-random-call-on-preempt-rt.patch
-+ features/all/rt/0097-genirq-disable-irqpoll-on-rt.patch
-+ features/all/rt/0098-genirq-force-threading.patch.patch
-+ features/all/rt/0099-drivers-net-fix-livelock-issues.patch
-+ features/all/rt/0100-drivers-net-vortex-fix-locking-issues.patch
-+ features/all/rt/0101-drivers-net-gianfar-Make-RT-aware.patch
-+ features/all/rt/0102-USB-Fix-the-mouse-problem-when-copying-large-amounts.patch
-+ features/all/rt/0103-local-var.patch.patch
-+ features/all/rt/0104-rt-local-irq-lock.patch.patch
-+ features/all/rt/0105-cpu-rt-variants.patch.patch
-+ features/all/rt/0106-mm-slab-wrap-functions.patch.patch
-+ features/all/rt/0107-slab-Fix-__do_drain-to-use-the-right-array-cache.patch
-+ features/all/rt/0108-mm-More-lock-breaks-in-slab.c.patch
-+ features/all/rt/0109-mm-page_alloc-rt-friendly-per-cpu-pages.patch
-+ features/all/rt/0110-mm-page_alloc-reduce-lock-sections-further.patch
-+ features/all/rt/0111-mm-page-alloc-fix.patch.patch
-+ features/all/rt/0112-mm-convert-swap-to-percpu-locked.patch
-+ features/all/rt/0113-mm-vmstat-fix-the-irq-lock-asymetry.patch.patch
-+ features/all/rt/0114-mm-make-vmstat-rt-aware.patch
-+ features/all/rt/0115-mm-shrink-the-page-frame-to-rt-size.patch
-+ features/all/rt/0116-ARM-Initialize-ptl-lock-for-vector-page.patch
-+ features/all/rt/0117-mm-Allow-only-slab-on-RT.patch
-+ features/all/rt/0118-radix-tree-rt-aware.patch.patch
-+ features/all/rt/0119-panic-disable-random-on-rt.patch
-+ features/all/rt/0120-ipc-Make-the-ipc-code-rt-aware.patch
-+ features/all/rt/0121-ipc-mqueue-Add-a-critical-section-to-avoid-a-deadloc.patch
-+ features/all/rt/0122-relay-fix-timer-madness.patch
-+ features/all/rt/0123-net-ipv4-route-use-locks-on-up-rt.patch.patch
-+ features/all/rt/0124-workqueue-avoid-the-lock-in-cpu-dying.patch.patch
-+ features/all/rt/0125-timers-prepare-for-full-preemption.patch
-+ features/all/rt/0126-timers-preempt-rt-support.patch
-+ features/all/rt/0127-timers-fix-timer-hotplug-on-rt.patch
-+ features/all/rt/0128-timers-mov-printk_tick-to-soft-interrupt.patch
-+ features/all/rt/0129-timer-delay-waking-softirqs-from-the-jiffy-tick.patch
-+ features/all/rt/0130-timers-Avoid-the-switch-timers-base-set-to-NULL-tric.patch
-+ features/all/rt/0131-printk-Don-t-call-printk_tick-in-printk_needs_cpu-on.patch
-+ features/all/rt/0132-hrtimers-prepare-full-preemption.patch
-+ features/all/rt/0133-hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch
-+ features/all/rt/0134-hrtimer-Don-t-call-the-timer-handler-from-hrtimer_st.patch
-+ features/all/rt/0135-hrtimer-Add-missing-debug_activate-aid-Was-Re-ANNOUN.patch
-+ features/all/rt/0136-hrtimer-fix-reprogram-madness.patch.patch
-+ features/all/rt/0137-timer-fd-Prevent-live-lock.patch
-+ features/all/rt/0138-posix-timers-thread-posix-cpu-timers-on-rt.patch
-+ features/all/rt/0139-posix-timers-Shorten-posix_cpu_timers-CPU-kernel-thr.patch
-+ features/all/rt/0140-posix-timers-Avoid-wakeups-when-no-timers-are-active.patch
-+ features/all/rt/0141-sched-delay-put-task.patch.patch
-+ features/all/rt/0142-sched-limit-nr-migrate.patch.patch
-+ features/all/rt/0143-sched-mmdrop-delayed.patch.patch
-+ features/all/rt/0144-sched-rt-mutex-wakeup.patch.patch
-+ features/all/rt/0145-sched-prevent-idle-boost.patch.patch
-+ features/all/rt/0146-sched-might-sleep-do-not-account-rcu-depth.patch.patch
-+ features/all/rt/0147-sched-Break-out-from-load_balancing-on-rq_lock-conte.patch
-+ features/all/rt/0148-sched-cond-resched.patch.patch
-+ features/all/rt/0149-cond-resched-softirq-fix.patch.patch
-+ features/all/rt/0150-sched-no-work-when-pi-blocked.patch.patch
-+ features/all/rt/0151-cond-resched-lock-rt-tweak.patch.patch
-+ features/all/rt/0152-sched-disable-ttwu-queue.patch.patch
-+ features/all/rt/0153-sched-Disable-CONFIG_RT_GROUP_SCHED-on-RT.patch
-+ features/all/rt/0154-sched-ttwu-Return-success-when-only-changing-the-sav.patch
-+ features/all/rt/0155-stop_machine-convert-stop_machine_run-to-PREEMPT_RT.patch
-+ features/all/rt/0156-stomp-machine-mark-stomper-thread.patch.patch
-+ features/all/rt/0157-stomp-machine-raw-lock.patch.patch
-+ features/all/rt/0158-hotplug-Lightweight-get-online-cpus.patch
-+ features/all/rt/0159-hotplug-sync_unplug-No.patch
-+ features/all/rt/0160-hotplug-Reread-hotplug_pcp-on-pin_current_cpu-retry.patch
-+ features/all/rt/0161-sched-migrate-disable.patch.patch
-+ features/all/rt/0162-hotplug-use-migrate-disable.patch.patch
-+ features/all/rt/0163-hotplug-Call-cpu_unplug_begin-before-DOWN_PREPARE.patch
-+ features/all/rt/0164-ftrace-migrate-disable-tracing.patch.patch
-+ features/all/rt/0165-tracing-Show-padding-as-unsigned-short.patch
-+ features/all/rt/0166-migrate-disable-rt-variant.patch.patch
-+ features/all/rt/0167-sched-Optimize-migrate_disable.patch
-+ features/all/rt/0168-sched-Generic-migrate_disable.patch
-+ features/all/rt/0169-sched-rt-Fix-migrate_enable-thinko.patch
-+ features/all/rt/0170-sched-teach-migrate_disable-about-atomic-contexts.patch
-+ features/all/rt/0171-sched-Postpone-actual-migration-disalbe-to-schedule.patch
-+ features/all/rt/0172-sched-Do-not-compare-cpu-masks-in-scheduler.patch
-+ features/all/rt/0173-sched-Have-migrate_disable-ignore-bounded-threads.patch
-+ features/all/rt/0174-sched-clear-pf-thread-bound-on-fallback-rq.patch.patch
-+ features/all/rt/0175-ftrace-crap.patch.patch
-+ features/all/rt/0176-ring-buffer-Convert-reader_lock-from-raw_spin_lock-i.patch
-+ features/all/rt/0177-net-netif_rx_ni-migrate-disable.patch.patch
-+ features/all/rt/0178-softirq-Sanitize-softirq-pending-for-NOHZ-RT.patch
-+ features/all/rt/0179-lockdep-rt.patch.patch
-+ features/all/rt/0180-mutex-no-spin-on-rt.patch.patch
-+ features/all/rt/0181-softirq-local-lock.patch.patch
-+ features/all/rt/0182-softirq-Export-in_serving_softirq.patch
-+ features/all/rt/0183-hardirq.h-Define-softirq_count-as-OUL-to-kill-build-.patch
-+ features/all/rt/0184-softirq-Fix-unplug-deadlock.patch
-+ features/all/rt/0185-softirq-disable-softirq-stacks-for-rt.patch.patch
-+ features/all/rt/0186-softirq-make-fifo.patch.patch
-+ features/all/rt/0187-tasklet-Prevent-tasklets-from-going-into-infinite-sp.patch
-+ features/all/rt/0188-genirq-Allow-disabling-of-softirq-processing-in-irq-.patch
-+ features/all/rt/0189-local-vars-migrate-disable.patch.patch
-+ features/all/rt/0190-md-raid5-Make-raid5_percpu-handling-RT-aware.patch
-+ features/all/rt/0191-rtmutex-lock-killable.patch.patch
-+ features/all/rt/0192-rtmutex-futex-prepare-rt.patch.patch
-+ features/all/rt/0193-futex-Fix-bug-on-when-a-requeued-RT-task-times-out.patch
-+ features/all/rt/0194-rt-mutex-add-sleeping-spinlocks-support.patch.patch
-+ features/all/rt/0195-spinlock-types-separate-raw.patch.patch
-+ features/all/rt/0196-rtmutex-avoid-include-hell.patch.patch
-+ features/all/rt/0197-rt-add-rt-spinlocks.patch.patch
-+ features/all/rt/0198-rt-add-rt-to-mutex-headers.patch.patch
-+ features/all/rt/0199-rwsem-add-rt-variant.patch.patch
-+ features/all/rt/0200-rt-Add-the-preempt-rt-lock-replacement-APIs.patch
-+ features/all/rt/0201-rwlocks-Fix-section-mismatch.patch
-+ features/all/rt/0202-timer-handle-idle-trylock-in-get-next-timer-irq.patc.patch
-+ features/all/rt/0203-RCU-Force-PREEMPT_RCU-for-PREEMPT-RT.patch
-+ features/all/rt/0204-rcu-Frob-softirq-test.patch
-+ features/all/rt/0205-rcu-Merge-RCU-bh-into-RCU-preempt.patch
-+ features/all/rt/0206-rcu-Fix-macro-substitution-for-synchronize_rcu_bh-on.patch
-+ features/all/rt/0207-rcu-more-fallout.patch.patch
-+ features/all/rt/0208-rcu-Make-ksoftirqd-do-RCU-quiescent-states.patch
-+ features/all/rt/0209-rt-rcutree-Move-misplaced-prototype.patch
-+ features/all/rt/0210-lglocks-rt.patch.patch
-+ features/all/rt/0211-serial-8250-Clean-up-the-locking-for-rt.patch
-+ features/all/rt/0212-serial-8250-Call-flush_to_ldisc-when-the-irq-is-thre.patch
-+ features/all/rt/0213-drivers-tty-fix-omap-lock-crap.patch.patch
-+ features/all/rt/0214-rt-Improve-the-serial-console-PASS_LIMIT.patch
-+ features/all/rt/0215-fs-namespace-preemption-fix.patch
-+ features/all/rt/0216-mm-protect-activate-switch-mm.patch.patch
-+ features/all/rt/0217-fs-block-rt-support.patch.patch
-+ features/all/rt/0218-fs-ntfs-disable-interrupt-only-on-RT.patch
-+ features/all/rt/0219-x86-Convert-mce-timer-to-hrtimer.patch
-+ features/all/rt/0220-x86-stackprotector-Avoid-random-pool-on-rt.patch
-+ features/all/rt/0221-x86-Use-generic-rwsem_spinlocks-on-rt.patch
-+ features/all/rt/0222-x86-Disable-IST-stacks-for-debug-int-3-stack-fault-f.patch
-+ features/all/rt/0223-workqueue-use-get-cpu-light.patch.patch
-+ features/all/rt/0224-epoll.patch.patch
-+ features/all/rt/0225-mm-vmalloc.patch.patch
-+ features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch
-+ features/all/rt/0226-workqueue-Fix-cpuhotplug-trainwreck.patch
-+ features/all/rt/0227-workqueue-Fix-PF_THREAD_BOUND-abuse.patch
-+ features/all/rt/0228-workqueue-Use-get_cpu_light-in-flush_gcwq.patch
-+ features/all/rt/0229-hotplug-stuff.patch.patch
-+ features/all/rt/0230-debugobjects-rt.patch.patch
-+ features/all/rt/0231-jump-label-rt.patch.patch
-+ features/all/rt/0232-skbufhead-raw-lock.patch.patch
-+ features/all/rt/0233-x86-no-perf-irq-work-rt.patch.patch
-+ features/all/rt/0234-console-make-rt-friendly.patch.patch
-+ features/all/rt/0235-printk-Disable-migration-instead-of-preemption.patch
-+ features/all/rt/0236-power-use-generic-rwsem-on-rt.patch
-+ features/all/rt/0237-power-disable-highmem-on-rt.patch.patch
-+ features/all/rt/0238-arm-disable-highmem-on-rt.patch.patch
-+ features/all/rt/0239-ARM-at91-tclib-Default-to-tclib-timer-for-RT.patch
-+ features/all/rt/0240-mips-disable-highmem-on-rt.patch.patch
-+ features/all/rt/0241-net-Avoid-livelock-in-net_tx_action-on-RT.patch
-+ features/all/rt/0242-ping-sysrq.patch.patch
-+ features/all/rt/0243-kgdb-serial-Short-term-workaround.patch
-+ features/all/rt/0244-add-sys-kernel-realtime-entry.patch
-+ features/all/rt/0245-mm-rt-kmap_atomic-scheduling.patch
-+ features/all/rt/0246-ipc-sem-Rework-semaphore-wakeups.patch
-+ features/all/rt/0247-sysrq-Allow-immediate-Magic-SysRq-output-for-PREEMPT.patch
-+ features/all/rt/0248-x86-kvm-require-const-tsc-for-rt.patch.patch
-+ features/all/rt/0249-scsi-fcoe-rt-aware.patch.patch
-+ features/all/rt/0250-x86-crypto-Reduce-preempt-disabled-regions.patch
-+ features/all/rt/0251-dm-Make-rt-aware.patch
-+ features/all/rt/0252-cpumask-Disable-CONFIG_CPUMASK_OFFSTACK-for-RT.patch
-+ features/all/rt/0253-seqlock-Prevent-rt-starvation.patch
-+ features/all/rt/0254-timer-Fix-hotplug-for-rt.patch
-+ features/all/rt/0255-futex-rt-Fix-possible-lockup-when-taking-pi_lock-in-.patch
-+ features/all/rt/0256-ring-buffer-rt-Check-for-irqs-disabled-before-grabbi.patch
-+ features/all/rt/0257-sched-rt-Fix-wait_task_interactive-to-test-rt_spin_l.patch
-+ features/all/rt/0258-lglock-rt-Use-non-rt-for_each_cpu-in-rt-code.patch
-+ features/all/rt/0259-cpu-Make-hotplug.lock-a-sleeping-spinlock-on-RT.patch
-+ features/all/rt/0260-softirq-Check-preemption-after-reenabling-interrupts.patch
-+ features/all/rt/0261-rt-Introduce-cpu_chill.patch
-+ features/all/rt/0262-fs-dcache-Use-cpu_chill-in-trylock-loops.patch
-+ features/all/rt/0263-net-Use-cpu_chill-instead-of-cpu_relax.patch
-+ features/all/rt/0264-kconfig-disable-a-few-options-rt.patch.patch
-+ features/all/rt/0265-kconfig-preempt-rt-full.patch.patch
-+ features/all/rt/0266-rt-Make-migrate_disable-enable-and-__rt_mutex_init-n.patch
+features/all/rt/0001-x86-Call-idle-notifier-after-irq_enter.patch
+features/all/rt/0002-slab-lockdep-Annotate-all-slab-caches.patch
+features/all/rt/0003-x86-kprobes-Remove-remove-bogus-preempt_enable.patch
+features/all/rt/0004-x86-hpet-Disable-MSI-on-Lenovo-W510.patch
+features/all/rt/0005-block-Shorten-interrupt-disabled-regions.patch
+features/all/rt/0006-sched-Distangle-worker-accounting-from-rq-3Elock.patch
+features/all/rt/0007-mips-enable-interrupts-in-signal.patch.patch
+features/all/rt/0008-arm-enable-interrupts-in-signal-code.patch.patch
+features/all/rt/0009-powerpc-85xx-Mark-cascade-irq-IRQF_NO_THREAD.patch
+features/all/rt/0010-powerpc-wsp-Mark-opb-cascade-handler-IRQF_NO_THREAD.patch
+features/all/rt/0011-powerpc-Mark-IPI-interrupts-IRQF_NO_THREAD.patch
+features/all/rt/0012-powerpc-Allow-irq-threading.patch
+features/all/rt/0013-sched-Keep-period-timer-ticking-when-throttling-acti.patch
+features/all/rt/0014-sched-Do-not-throttle-due-to-PI-boosting.patch
+features/all/rt/0015-time-Remove-bogus-comments.patch
+features/all/rt/0016-x86-vdso-Remove-bogus-locking-in-update_vsyscall_tz.patch
+features/all/rt/0017-x86-vdso-Use-seqcount-instead-of-seqlock.patch
+features/all/rt/0018-ia64-vsyscall-Use-seqcount-instead-of-seqlock.patch
+features/all/rt/0019-seqlock-Remove-unused-functions.patch
+features/all/rt/0020-seqlock-Use-seqcount.patch
+features/all/rt/0021-vfs-fs_struct-Move-code-out-of-seqcount-write-sectio.patch
+features/all/rt/0022-timekeeping-Split-xtime_lock.patch
+features/all/rt/0023-intel_idle-Convert-i7300_idle_lock-to-raw-spinlock.patch
+features/all/rt/0024-mm-memcg-shorten-preempt-disabled-section-around-eve.patch
+features/all/rt/0025-tracing-Account-for-preempt-off-in-preempt_schedule.patch
+features/all/rt/0026-signal-revert-ptrace-preempt-magic.patch.patch
+features/all/rt/0027-arm-Mark-pmu-interupt-IRQF_NO_THREAD.patch
+features/all/rt/0028-arm-Allow-forced-irq-threading.patch
+features/all/rt/0029-preempt-rt-Convert-arm-boot_lock-to-raw.patch
+features/all/rt/0030-sched-Create-schedule_preempt_disabled.patch
+features/all/rt/0031-sched-Use-schedule_preempt_disabled.patch
+features/all/rt/0032-signals-Do-not-wakeup-self.patch
+features/all/rt/0033-posix-timers-Prevent-broadcast-signals.patch
+features/all/rt/0034-signals-Allow-rt-tasks-to-cache-one-sigqueue-struct.patch
+features/all/rt/0035-signal-x86-Delay-calling-signals-in-atomic.patch
+features/all/rt/0036-generic-Use-raw-local-irq-variant-for-generic-cmpxch.patch
+features/all/rt/0037-drivers-random-Reduce-preempt-disabled-region.patch
+features/all/rt/0038-ARM-AT91-PIT-Remove-irq-handler-when-clock-event-is-.patch
+features/all/rt/0039-clocksource-TCLIB-Allow-higher-clock-rates-for-clock.patch
+features/all/rt/0040-drivers-net-tulip_remove_one-needs-to-call-pci_disab.patch
+features/all/rt/0041-drivers-net-Use-disable_irq_nosync-in-8139too.patch
+features/all/rt/0042-drivers-net-ehea-Make-rx-irq-handler-non-threaded-IR.patch
+features/all/rt/0043-drivers-net-at91_ether-Make-mdio-protection-rt-safe.patch
+features/all/rt/0044-preempt-mark-legitimated-no-resched-sites.patch.patch
+features/all/rt/0045-mm-Prepare-decoupling-the-page-fault-disabling-logic.patch
+features/all/rt/0046-mm-Fixup-all-fault-handlers-to-check-current-pagefau.patch
+features/all/rt/0047-mm-pagefault_disabled.patch
+features/all/rt/0048-mm-raw_pagefault_disable.patch
+features/all/rt/0049-filemap-fix-up.patch.patch
+features/all/rt/0050-mm-Remove-preempt-count-from-pagefault-disable-enabl.patch
+features/all/rt/0051-x86-highmem-Replace-BUG_ON-by-WARN_ON.patch
+features/all/rt/0052-suspend-Prevent-might-sleep-splats.patch
+features/all/rt/0053-OF-Fixup-resursive-locking-code-paths.patch
+features/all/rt/0054-of-convert-devtree-lock.patch.patch
+features/all/rt/0055-list-add-list-last-entry.patch.patch
+features/all/rt/0056-mm-page-alloc-use-list-last-entry.patch.patch
+features/all/rt/0057-mm-slab-move-debug-out.patch.patch
+features/all/rt/0058-rwsem-inlcude-fix.patch.patch
+features/all/rt/0059-sysctl-include-fix.patch.patch
+features/all/rt/0060-net-flip-lock-dep-thingy.patch.patch
+features/all/rt/0061-softirq-thread-do-softirq.patch.patch
+features/all/rt/0062-softirq-split-out-code.patch.patch
+features/all/rt/0063-x86-Do-not-unmask-io_apic-when-interrupt-is-in-progr.patch
+features/all/rt/0064-x86-32-fix-signal-crap.patch.patch
+features/all/rt/0065-x86-Do-not-disable-preemption-in-int3-on-32bit.patch
+features/all/rt/0066-rcu-Reduce-lock-section.patch
+features/all/rt/0067-locking-various-init-fixes.patch.patch
+features/all/rt/0068-wait-Provide-__wake_up_all_locked.patch
+features/all/rt/0069-pci-Use-__wake_up_all_locked-pci_unblock_user_cfg_ac.patch
+features/all/rt/0070-latency-hist.patch.patch
+features/all/rt/0071-hwlatdetect.patch.patch
+features/all/rt/0073-early-printk-consolidate.patch.patch
+features/all/rt/0074-printk-kill.patch.patch
+features/all/rt/0075-printk-force_early_printk-boot-param-to-help-with-de.patch
+features/all/rt/0076-rt-preempt-base-config.patch.patch
+features/all/rt/0077-bug-BUG_ON-WARN_ON-variants-dependend-on-RT-RT.patch
+features/all/rt/0078-rt-local_irq_-variants-depending-on-RT-RT.patch
+features/all/rt/0079-preempt-Provide-preempt_-_-no-rt-variants.patch
+features/all/rt/0080-ata-Do-not-disable-interrupts-in-ide-code-for-preemp.patch
+features/all/rt/0081-ide-Do-not-disable-interrupts-for-PREEMPT-RT.patch
+features/all/rt/0082-infiniband-Mellanox-IB-driver-patch-use-_nort-primit.patch
+features/all/rt/0083-input-gameport-Do-not-disable-interrupts-on-PREEMPT_.patch
+features/all/rt/0084-acpi-Do-not-disable-interrupts-on-PREEMPT_RT.patch
+features/all/rt/0085-core-Do-not-disable-interrupts-on-RT-in-kernel-users.patch
+features/all/rt/0086-core-Do-not-disable-interrupts-on-RT-in-res_counter..patch
+features/all/rt/0087-usb-Use-local_irq_-_nort-variants.patch
+features/all/rt/0088-tty-Do-not-disable-interrupts-in-put_ldisc-on-rt.patch
+features/all/rt/0089-mm-scatterlist-dont-disable-irqs-on-RT.patch
+features/all/rt/0090-signal-fix-up-rcu-wreckage.patch.patch
+features/all/rt/0091-net-wireless-warn-nort.patch.patch
+features/all/rt/0092-mm-Replace-cgroup_page-bit-spinlock.patch
+features/all/rt/0093-buffer_head-Replace-bh_uptodate_lock-for-rt.patch
+features/all/rt/0094-fs-jbd-jbd2-Make-state-lock-and-journal-head-lock-rt.patch
+features/all/rt/0095-genirq-Disable-DEBUG_SHIRQ-for-rt.patch
+features/all/rt/0096-genirq-Disable-random-call-on-preempt-rt.patch
+features/all/rt/0097-genirq-disable-irqpoll-on-rt.patch
+features/all/rt/0098-genirq-force-threading.patch.patch
+features/all/rt/0099-drivers-net-fix-livelock-issues.patch
+features/all/rt/0100-drivers-net-vortex-fix-locking-issues.patch
+features/all/rt/0101-drivers-net-gianfar-Make-RT-aware.patch
+features/all/rt/0102-USB-Fix-the-mouse-problem-when-copying-large-amounts.patch
+features/all/rt/0103-local-var.patch.patch
+features/all/rt/0104-rt-local-irq-lock.patch.patch
+features/all/rt/0105-cpu-rt-variants.patch.patch
+features/all/rt/0106-mm-slab-wrap-functions.patch.patch
+features/all/rt/0107-slab-Fix-__do_drain-to-use-the-right-array-cache.patch
+features/all/rt/0108-mm-More-lock-breaks-in-slab.c.patch
+features/all/rt/0109-mm-page_alloc-rt-friendly-per-cpu-pages.patch
+features/all/rt/0110-mm-page_alloc-reduce-lock-sections-further.patch
+features/all/rt/0111-mm-page-alloc-fix.patch.patch
+features/all/rt/0112-mm-convert-swap-to-percpu-locked.patch
+features/all/rt/0113-mm-vmstat-fix-the-irq-lock-asymetry.patch.patch
+features/all/rt/0114-mm-make-vmstat-rt-aware.patch
+features/all/rt/0115-mm-shrink-the-page-frame-to-rt-size.patch
+features/all/rt/0116-ARM-Initialize-ptl-lock-for-vector-page.patch
+features/all/rt/0117-mm-Allow-only-slab-on-RT.patch
+features/all/rt/0118-radix-tree-rt-aware.patch.patch
+features/all/rt/0119-panic-disable-random-on-rt.patch
+features/all/rt/0120-ipc-Make-the-ipc-code-rt-aware.patch
+features/all/rt/0121-ipc-mqueue-Add-a-critical-section-to-avoid-a-deadloc.patch
+features/all/rt/0122-relay-fix-timer-madness.patch
+features/all/rt/0123-net-ipv4-route-use-locks-on-up-rt.patch.patch
+features/all/rt/0124-workqueue-avoid-the-lock-in-cpu-dying.patch.patch
+features/all/rt/0125-timers-prepare-for-full-preemption.patch
+features/all/rt/0126-timers-preempt-rt-support.patch
+features/all/rt/0127-timers-fix-timer-hotplug-on-rt.patch
+features/all/rt/0128-timers-mov-printk_tick-to-soft-interrupt.patch
+features/all/rt/0129-timer-delay-waking-softirqs-from-the-jiffy-tick.patch
+features/all/rt/0130-timers-Avoid-the-switch-timers-base-set-to-NULL-tric.patch
+features/all/rt/0131-printk-Don-t-call-printk_tick-in-printk_needs_cpu-on.patch
+features/all/rt/0132-hrtimers-prepare-full-preemption.patch
+features/all/rt/0133-hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch
+features/all/rt/0134-hrtimer-Don-t-call-the-timer-handler-from-hrtimer_st.patch
+features/all/rt/0135-hrtimer-Add-missing-debug_activate-aid-Was-Re-ANNOUN.patch
+features/all/rt/0136-hrtimer-fix-reprogram-madness.patch.patch
+features/all/rt/0137-timer-fd-Prevent-live-lock.patch
+features/all/rt/0138-posix-timers-thread-posix-cpu-timers-on-rt.patch
+features/all/rt/0139-posix-timers-Shorten-posix_cpu_timers-CPU-kernel-thr.patch
+features/all/rt/0140-posix-timers-Avoid-wakeups-when-no-timers-are-active.patch
+features/all/rt/0141-sched-delay-put-task.patch.patch
+features/all/rt/0142-sched-limit-nr-migrate.patch.patch
+features/all/rt/0143-sched-mmdrop-delayed.patch.patch
+features/all/rt/0144-sched-rt-mutex-wakeup.patch.patch
+features/all/rt/0145-sched-prevent-idle-boost.patch.patch
+features/all/rt/0146-sched-might-sleep-do-not-account-rcu-depth.patch.patch
+features/all/rt/0147-sched-Break-out-from-load_balancing-on-rq_lock-conte.patch
+features/all/rt/0148-sched-cond-resched.patch.patch
+features/all/rt/0149-cond-resched-softirq-fix.patch.patch
+features/all/rt/0150-sched-no-work-when-pi-blocked.patch.patch
+features/all/rt/0151-cond-resched-lock-rt-tweak.patch.patch
+features/all/rt/0152-sched-disable-ttwu-queue.patch.patch
+features/all/rt/0153-sched-Disable-CONFIG_RT_GROUP_SCHED-on-RT.patch
+features/all/rt/0154-sched-ttwu-Return-success-when-only-changing-the-sav.patch
+features/all/rt/0155-stop_machine-convert-stop_machine_run-to-PREEMPT_RT.patch
+features/all/rt/0156-stomp-machine-mark-stomper-thread.patch.patch
+features/all/rt/0157-stomp-machine-raw-lock.patch.patch
+features/all/rt/0158-hotplug-Lightweight-get-online-cpus.patch
+features/all/rt/0159-hotplug-sync_unplug-No.patch
+features/all/rt/0160-hotplug-Reread-hotplug_pcp-on-pin_current_cpu-retry.patch
+features/all/rt/0161-sched-migrate-disable.patch.patch
+features/all/rt/0162-hotplug-use-migrate-disable.patch.patch
+features/all/rt/0163-hotplug-Call-cpu_unplug_begin-before-DOWN_PREPARE.patch
+features/all/rt/0164-ftrace-migrate-disable-tracing.patch.patch
+features/all/rt/0165-tracing-Show-padding-as-unsigned-short.patch
+features/all/rt/0166-migrate-disable-rt-variant.patch.patch
+features/all/rt/0167-sched-Optimize-migrate_disable.patch
+features/all/rt/0168-sched-Generic-migrate_disable.patch
+features/all/rt/0169-sched-rt-Fix-migrate_enable-thinko.patch
+features/all/rt/0170-sched-teach-migrate_disable-about-atomic-contexts.patch
+features/all/rt/0171-sched-Postpone-actual-migration-disalbe-to-schedule.patch
+features/all/rt/0172-sched-Do-not-compare-cpu-masks-in-scheduler.patch
+features/all/rt/0173-sched-Have-migrate_disable-ignore-bounded-threads.patch
+features/all/rt/0174-sched-clear-pf-thread-bound-on-fallback-rq.patch.patch
+features/all/rt/0175-ftrace-crap.patch.patch
+features/all/rt/0176-ring-buffer-Convert-reader_lock-from-raw_spin_lock-i.patch
+features/all/rt/0177-net-netif_rx_ni-migrate-disable.patch.patch
+features/all/rt/0178-softirq-Sanitize-softirq-pending-for-NOHZ-RT.patch
+features/all/rt/0179-lockdep-rt.patch.patch
+features/all/rt/0180-mutex-no-spin-on-rt.patch.patch
+features/all/rt/0181-softirq-local-lock.patch.patch
+features/all/rt/0182-softirq-Export-in_serving_softirq.patch
+features/all/rt/0183-hardirq.h-Define-softirq_count-as-OUL-to-kill-build-.patch
+features/all/rt/0184-softirq-Fix-unplug-deadlock.patch
+features/all/rt/0185-softirq-disable-softirq-stacks-for-rt.patch.patch
+features/all/rt/0186-softirq-make-fifo.patch.patch
+features/all/rt/0187-tasklet-Prevent-tasklets-from-going-into-infinite-sp.patch
+features/all/rt/0188-genirq-Allow-disabling-of-softirq-processing-in-irq-.patch
+features/all/rt/0189-local-vars-migrate-disable.patch.patch
+features/all/rt/0190-md-raid5-Make-raid5_percpu-handling-RT-aware.patch
+features/all/rt/0191-rtmutex-lock-killable.patch.patch
+features/all/rt/0192-rtmutex-futex-prepare-rt.patch.patch
+features/all/rt/0193-futex-Fix-bug-on-when-a-requeued-RT-task-times-out.patch
+features/all/rt/0194-rt-mutex-add-sleeping-spinlocks-support.patch.patch
+features/all/rt/0195-spinlock-types-separate-raw.patch.patch
+features/all/rt/0196-rtmutex-avoid-include-hell.patch.patch
+features/all/rt/0197-rt-add-rt-spinlocks.patch.patch
+features/all/rt/0198-rt-add-rt-to-mutex-headers.patch.patch
+features/all/rt/0199-rwsem-add-rt-variant.patch.patch
+features/all/rt/0200-rt-Add-the-preempt-rt-lock-replacement-APIs.patch
+features/all/rt/0201-rwlocks-Fix-section-mismatch.patch
+features/all/rt/0202-timer-handle-idle-trylock-in-get-next-timer-irq.patc.patch
+features/all/rt/0203-RCU-Force-PREEMPT_RCU-for-PREEMPT-RT.patch
+features/all/rt/0204-rcu-Frob-softirq-test.patch
+features/all/rt/0205-rcu-Merge-RCU-bh-into-RCU-preempt.patch
+features/all/rt/0206-rcu-Fix-macro-substitution-for-synchronize_rcu_bh-on.patch
+features/all/rt/0207-rcu-more-fallout.patch.patch
+features/all/rt/0208-rcu-Make-ksoftirqd-do-RCU-quiescent-states.patch
+features/all/rt/0209-rt-rcutree-Move-misplaced-prototype.patch
+features/all/rt/0210-lglocks-rt.patch.patch
+features/all/rt/0211-serial-8250-Clean-up-the-locking-for-rt.patch
+features/all/rt/0212-serial-8250-Call-flush_to_ldisc-when-the-irq-is-thre.patch
+features/all/rt/0213-drivers-tty-fix-omap-lock-crap.patch.patch
+features/all/rt/0214-rt-Improve-the-serial-console-PASS_LIMIT.patch
+features/all/rt/0215-fs-namespace-preemption-fix.patch
+features/all/rt/0216-mm-protect-activate-switch-mm.patch.patch
+features/all/rt/0217-fs-block-rt-support.patch.patch
+features/all/rt/0218-fs-ntfs-disable-interrupt-only-on-RT.patch
+features/all/rt/0219-x86-Convert-mce-timer-to-hrtimer.patch
+features/all/rt/0220-x86-stackprotector-Avoid-random-pool-on-rt.patch
+features/all/rt/0221-x86-Use-generic-rwsem_spinlocks-on-rt.patch
+features/all/rt/0222-x86-Disable-IST-stacks-for-debug-int-3-stack-fault-f.patch
+features/all/rt/0223-workqueue-use-get-cpu-light.patch.patch
+features/all/rt/0224-epoll.patch.patch
+features/all/rt/0225-mm-vmalloc.patch.patch
+features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch
+features/all/rt/0226-workqueue-Fix-cpuhotplug-trainwreck.patch
+features/all/rt/0227-workqueue-Fix-PF_THREAD_BOUND-abuse.patch
+features/all/rt/0228-workqueue-Use-get_cpu_light-in-flush_gcwq.patch
+features/all/rt/0229-hotplug-stuff.patch.patch
+features/all/rt/0230-debugobjects-rt.patch.patch
+features/all/rt/0231-jump-label-rt.patch.patch
+features/all/rt/0232-skbufhead-raw-lock.patch.patch
+features/all/rt/0233-x86-no-perf-irq-work-rt.patch.patch
+features/all/rt/0234-console-make-rt-friendly.patch.patch
+features/all/rt/0235-printk-Disable-migration-instead-of-preemption.patch
+features/all/rt/0236-power-use-generic-rwsem-on-rt.patch
+features/all/rt/0237-power-disable-highmem-on-rt.patch.patch
+features/all/rt/0238-arm-disable-highmem-on-rt.patch.patch
+features/all/rt/0239-ARM-at91-tclib-Default-to-tclib-timer-for-RT.patch
+features/all/rt/0240-mips-disable-highmem-on-rt.patch.patch
+features/all/rt/0241-net-Avoid-livelock-in-net_tx_action-on-RT.patch
+features/all/rt/0242-ping-sysrq.patch.patch
+features/all/rt/0243-kgdb-serial-Short-term-workaround.patch
+features/all/rt/0244-add-sys-kernel-realtime-entry.patch
+features/all/rt/0245-mm-rt-kmap_atomic-scheduling.patch
+features/all/rt/0246-ipc-sem-Rework-semaphore-wakeups.patch
+features/all/rt/0247-sysrq-Allow-immediate-Magic-SysRq-output-for-PREEMPT.patch
+features/all/rt/0248-x86-kvm-require-const-tsc-for-rt.patch.patch
+features/all/rt/0249-scsi-fcoe-rt-aware.patch.patch
+features/all/rt/0250-x86-crypto-Reduce-preempt-disabled-regions.patch
+features/all/rt/0251-dm-Make-rt-aware.patch
+features/all/rt/0252-cpumask-Disable-CONFIG_CPUMASK_OFFSTACK-for-RT.patch
+features/all/rt/0253-seqlock-Prevent-rt-starvation.patch
+features/all/rt/0254-timer-Fix-hotplug-for-rt.patch
+features/all/rt/0255-futex-rt-Fix-possible-lockup-when-taking-pi_lock-in-.patch
+features/all/rt/0256-ring-buffer-rt-Check-for-irqs-disabled-before-grabbi.patch
+features/all/rt/0257-sched-rt-Fix-wait_task_interactive-to-test-rt_spin_l.patch
+features/all/rt/0258-lglock-rt-Use-non-rt-for_each_cpu-in-rt-code.patch
+features/all/rt/0259-cpu-Make-hotplug.lock-a-sleeping-spinlock-on-RT.patch
+features/all/rt/0260-softirq-Check-preemption-after-reenabling-interrupts.patch
+features/all/rt/0261-rt-Introduce-cpu_chill.patch
+features/all/rt/0262-fs-dcache-Use-cpu_chill-in-trylock-loops.patch
+features/all/rt/0263-net-Use-cpu_chill-instead-of-cpu_relax.patch
+features/all/rt/0264-kconfig-disable-a-few-options-rt.patch.patch
+features/all/rt/0265-kconfig-preempt-rt-full.patch.patch
+features/all/rt/0266-rt-Make-migrate_disable-enable-and-__rt_mutex_init-n.patch
Modified: dists/squeeze-backports/linux/debian/rules
==============================================================================
--- dists/squeeze-backports/linux/debian/rules Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/rules Fri Jun 29 01:09:59 2012 (r19230)
@@ -39,18 +39,19 @@
@$(stamp)
DIR_ORIG = ../orig/$(SOURCE)-$(VERSION_UPSTREAM)
-TAR_ORIG_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig.tar.gz
+TAR_ORIG_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig.tar.xz
TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME)))
orig: $(DIR_ORIG)
- rsync --delete --exclude debian --exclude .svk --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
+ rsync --delete --exclude /debian --exclude .svk --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
+ QUILT_PATCHES='$(CURDIR)/debian/patches' quilt push --quiltrc - -a -q --fuzz=0
$(DIR_ORIG):
ifeq ($(TAR_ORIG),)
$(error Cannot find orig tarball $(TAR_ORIG_NAME))
else
mkdir -p ../orig
- tar -C ../orig -xzf $(TAR_ORIG)
+ tar -C ../orig -xaf $(TAR_ORIG)
endif
maintainerclean:
Modified: dists/squeeze-backports/linux/debian/rules.real
==============================================================================
--- dists/squeeze-backports/linux/debian/rules.real Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/rules.real Fri Jun 29 01:09:59 2012 (r19230)
@@ -60,34 +60,53 @@
$(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(KCONFIG)
python debian/bin/kconfig.py '$@' $(KCONFIG) $(KCONFIG_OPTIONS)
-$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
+define copy_source
+mkdir -p '$(1)'
+cp -al $(filter-out debian .pc .svk .svn, $(wildcard * .[^.]*)) '$(1)'
+endef
+
$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION)
$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: $(STAMPS_DIR)/source
rm -rf '$@' '$(DIR)'
- cp -al '$(SOURCE_DIR)' '$(DIR)'
+ $(call copy_source,$(DIR))
chmod -R u+rw,go=rX '$(DIR)'
cd '$(BUILD_DIR)'; tar -cjf 'linux-source-$(UPSTREAMVERSION).tar.bz2' 'linux-source-$(UPSTREAMVERSION)'
rm -rf '$(DIR)'
+$(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-%.patch.bz2: $(STAMPS_DIR)/source_none $(STAMPS_DIR)/source_%
+ set -o pipefail; \
+ (cd '$(BUILD_DIR)'; \
+ set +e; \
+ diff -urN -p -x debian -x .pc -x .svk -x .svn source_none source_$*; \
+ test $$? -eq 1) | \
+ filterdiff --remove-timestamps --strip=1 --addoldprefix=a/ --addnewprefix=b/ | \
+ bzip2 -c >$@ || \
+ (rm -f $@; exit 1)
+
define patch_cmd
-cd '$(DIR)'; python '$(CURDIR)/debian/bin/patch.apply' --overwrite-home='$(CURDIR)/debian/patches'
+cd '$(DIR)' && QUILT_PATCHES='$(CURDIR)/debian/patches' QUILT_SERIES=series-$(1) quilt push --quiltrc - -a -q --fuzz=0
endef
-$(STAMPS_DIR)/source: SOURCE_FILES = $(filter-out debian, $(wildcard * .[^.]*))
-$(STAMPS_DIR)/source: DIR = $(BUILD_DIR)/source
$(STAMPS_DIR)/source:
- rm -rf '$(DIR)'
- mkdir -p '$(DIR)'
- cp -al $(SOURCE_FILES) '$(DIR)'
- $(patch_cmd)
+ test -d .pc
+ set +e; quilt unapplied --quiltrc - >/dev/null && echo 'Patch series not fully applied'; test $$? -eq 1
@$(stamp)
-$(STAMPS_DIR)/source_$(FEATURESET): SOURCE_DIR=$(BUILD_DIR)/source
-$(STAMPS_DIR)/source_$(FEATURESET): DIR=$(BUILD_DIR)/source_$(FEATURESET)
-$(STAMPS_DIR)/source_$(FEATURESET): $(STAMPS_DIR)/source
+$(STAMPS_DIR)/source_%: SOURCE_DIR=$(BUILD_DIR)/source
+$(STAMPS_DIR)/source_%: DIR=$(BUILD_DIR)/source_$*
+$(STAMPS_DIR)/source_%: $(STAMPS_DIR)/source
+ mkdir -p '$(BUILD_DIR)'
rm -rf '$(DIR)'
- cp -al '$(SOURCE_DIR)' '$(DIR)'
- $(patch_cmd) -f $(FEATURESET)
+ $(call copy_source,$(DIR))
+ $(call patch_cmd,$*)
+ @$(stamp)
+.PRECIOUS: $(STAMPS_DIR)/source_%
+
+$(STAMPS_DIR)/source_none: DIR=$(BUILD_DIR)/source_none
+$(STAMPS_DIR)/source_none: $(STAMPS_DIR)/source
+ mkdir -p '$(BUILD_DIR)'
+ rm -f '$(DIR)'
+ ln -s '$(CURDIR)' '$(DIR)'
@$(stamp)
$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): CONFIG=$(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR)
@@ -131,13 +150,12 @@
python debian/bin/buildcheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
@$(stamp)
-$(STAMPS_DIR)/build-doc: SOURCE_DIR=$(BUILD_DIR)/source
$(STAMPS_DIR)/build-doc: DIR=$(BUILD_DIR)/build-doc
$(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source
rm -rf $(DIR)
- mkdir $(DIR)
- +$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' xmldocs
- +$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' htmldocs mandocs
+ mkdir -p $(DIR)
+ +$(MAKE_CLEAN) O='$(CURDIR)/$(DIR)' xmldocs
+ +$(MAKE_CLEAN) O='$(CURDIR)/$(DIR)' htmldocs mandocs
@$(stamp)
install-base:
@@ -159,14 +177,13 @@
install-doc: PACKAGE_NAME = linux-doc-$(VERSION)
install-doc: DIR = $(BUILD_DIR)/build-doc
-install-doc: SOURCE_DIR = $(BUILD_DIR)/source
install-doc: PACKAGE_DIR = debian/$(PACKAGE_NAME)
install-doc: OUT_DIR = $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)
install-doc: DH_OPTIONS = -p$(PACKAGE_NAME)
install-doc: $(STAMPS_DIR)/build-doc
dh_prep
mkdir -p $(OUT_DIR)
- cp -a $(addprefix $(SOURCE_DIR)/, CREDITS MAINTAINERS README REPORTING-BUGS Documentation) $(OUT_DIR)
+ cp -a CREDITS MAINTAINERS README REPORTING-BUGS Documentation $(OUT_DIR)
rm -rf $(OUT_DIR)/Documentation/DocBook
cd $(DIR)/Documentation/DocBook; \
find * -name '*.html' -print \
@@ -275,7 +292,6 @@
install-libc-dev_$(ARCH): PACKAGE_NAME = linux-libc-dev
install-libc-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-libc-dev_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/source
install-libc-dev_$(ARCH): DIR = $(BUILD_DIR)/build-libc-dev
install-libc-dev_$(ARCH): OUT_DIR = debian/$(PACKAGE_NAME)/usr
install-libc-dev_$(ARCH):
@@ -283,9 +299,9 @@
dh_testroot
dh_prep
rm -rf '$(DIR)'
- mkdir $(DIR)
- +$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_check ARCH=$(KERNEL_ARCH)
- +$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_install ARCH=$(KERNEL_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR)
+ mkdir -p $(DIR)
+ +$(MAKE_CLEAN) O='$(CURDIR)/$(DIR)' headers_check ARCH=$(KERNEL_ARCH)
+ +$(MAKE_CLEAN) O='$(CURDIR)/$(DIR)' headers_install ARCH=$(KERNEL_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR)
rm -rf $(OUT_DIR)/include/drm $(OUT_DIR)/include/scsi
find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} +
@@ -472,10 +488,10 @@
dh_builddeb
install-source: DH_OPTIONS = -plinux-source-$(VERSION)
-install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2
+install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2 $(foreach FEATURESET,$(filter-out none,$(ALL_FEATURESETS)),$(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-$(FEATURESET).patch.bz2)
dh_testdir
dh_testroot
- dh_install '$<' /usr/src
+ dh_install '$^' /usr/src
+$(MAKE_SELF) install-base
# vim: filetype=make
Modified: dists/squeeze-backports/linux/debian/source/format
==============================================================================
--- dists/squeeze-backports/linux/debian/source/format Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/source/format Fri Jun 29 01:09:59 2012 (r19230)
@@ -1,2 +1,2 @@
-1.0
+3.0 (quilt)
Copied: dists/squeeze-backports/linux/debian/source/local-options (from r19123, dists/sid/linux/debian/source/local-options)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/source/local-options Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/source/local-options)
@@ -0,0 +1 @@
+abort-on-upstream-changes
Copied: dists/squeeze-backports/linux/debian/source/options (from r19123, dists/sid/linux/debian/source/options)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux/debian/source/options Fri Jun 29 01:09:59 2012 (r19230, copy of r19123, dists/sid/linux/debian/source/options)
@@ -0,0 +1 @@
+compression = "xz"
Modified: dists/squeeze-backports/linux/debian/templates/control.source.in
==============================================================================
--- dists/squeeze-backports/linux/debian/templates/control.source.in Fri Jun 29 01:07:45 2012 (r19229)
+++ dists/squeeze-backports/linux/debian/templates/control.source.in Fri Jun 29 01:09:59 2012 (r19230)
@@ -3,7 +3,7 @@
Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>, maximilian attems <maks at debian.org>, Ben Hutchings <ben at decadent.org.uk>
Standards-Version: 3.9.2
-Build-Depends: debhelper (>> 7), cpio, kmod | module-init-tools, python (>= 2.6.6-3~), lzma [armel]
+Build-Depends: debhelper (>> 7), cpio, kmod | module-init-tools, python (>= 2.6.6-3~), lzma [armel], quilt, patchutils
Build-Depends-Indep: bzip2, xmlto
Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux/
Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux/
More information about the Kernel-svn-changes
mailing list