[kernel] r19270 - in dists/trunk/linux/debian: . config patches patches/bugfix/all patches/bugfix/alpha patches/bugfix/x86 patches/debian patches/features/all/be2net patches/features/all/codel patches/features/all/wacom patches/features/arm
Ben Hutchings
benh at alioth.debian.org
Sat Jul 21 23:32:15 UTC 2012
Author: benh
Date: Sat Jul 21 23:32:14 2012
New Revision: 19270
Log:
Update to 3.5
Drop many patches that were backported from 3.5.
Refresh debian/kernelvariables.patch
Disable aufs and rt for now.
Deleted:
dists/trunk/linux/debian/patches/bugfix/all/KVM-Fix-buffer-overflow-in-kvm_set_irq.patch
dists/trunk/linux/debian/patches/bugfix/all/macvtap-zerocopy-fix-offset-calculation-when-buildin.patch
dists/trunk/linux/debian/patches/bugfix/all/macvtap-zerocopy-fix-truesize-underestimation.patch
dists/trunk/linux/debian/patches/bugfix/all/macvtap-zerocopy-put-page-when-fail-to-get-all-reque.patch
dists/trunk/linux/debian/patches/bugfix/all/macvtap-zerocopy-set-SKBTX_DEV_ZEROCOPY-only-when-sk.patch
dists/trunk/linux/debian/patches/bugfix/all/macvtap-zerocopy-validate-vectors-before-building-sk.patch
dists/trunk/linux/debian/patches/bugfix/all/net-sock-validate-data_len-before-allocating-skb-in-.patch
dists/trunk/linux/debian/patches/bugfix/alpha/alpha-add-io-read-write-16-32-be-functions.patch
dists/trunk/linux/debian/patches/bugfix/x86/mm-pmd_read_atomic-fix-32bit-pae-pmd-walk-vs-pmd_populate-smp-race.patch
dists/trunk/linux/debian/patches/bugfix/x86/thp-avoid-atomic64_read-in-pmd_read_atomic-for-32bit-pae.patch
dists/trunk/linux/debian/patches/features/all/be2net/
dists/trunk/linux/debian/patches/features/all/codel/
dists/trunk/linux/debian/patches/features/all/wacom/0020-Input-wacom-add-basic-Intuos5-support.patch
dists/trunk/linux/debian/patches/features/all/wacom/0021-Input-wacom-add-Intuos5-Touch-Ring-ExpressKey-suppor.patch
dists/trunk/linux/debian/patches/features/all/wacom/0022-Input-wacom-add-Intuos5-Touch-Ring-LED-support.patch
dists/trunk/linux/debian/patches/features/all/wacom/0023-Input-wacom-add-Intuos5-multitouch-sensor-support.patch
dists/trunk/linux/debian/patches/features/all/wacom/0024-Input-wacom-retrieve-maximum-number-of-touch-points.patch
dists/trunk/linux/debian/patches/features/all/wacom/0025-Input-wacom-add-0xE5-MT-device-support.patch
dists/trunk/linux/debian/patches/features/all/wacom/0026-Input-wacom-return-proper-error-if-usb_get_extra_des.patch
dists/trunk/linux/debian/patches/features/all/wacom/0027-wacom-do-not-crash-when-retrieving-touch_max.patch
dists/trunk/linux/debian/patches/features/all/wacom/0028-wacom-leave-touch_max-as-is-if-predefined.patch
dists/trunk/linux/debian/patches/features/arm/kirkwood-add-iconnect-support.patch
dists/trunk/linux/debian/patches/features/arm/kirkwood-create-a-generic-function-for-gpio-led-blinking.patch
dists/trunk/linux/debian/patches/features/arm/kirkwood-fix-orion_gpio_set_blink.patch
dists/trunk/linux/debian/patches/features/arm/net-drop-NET-dependency-from-HAVE_BPF_JIT.patch
Modified:
dists/trunk/linux/debian/changelog
dists/trunk/linux/debian/config/defines
dists/trunk/linux/debian/patches/debian/kernelvariables.patch
dists/trunk/linux/debian/patches/series
Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog Sat Jul 21 22:07:39 2012 (r19269)
+++ dists/trunk/linux/debian/changelog Sat Jul 21 23:32:14 2012 (r19270)
@@ -1,6 +1,11 @@
-linux (3.4.4-1~experimental.2) UNRELEASED; urgency=low
+linux (3.5-1~experimental.1) UNRELEASED; urgency=low
+ * New upstream release: http://kernelnewbies.org/Linux_3.5
+
+ [ Ben Hutchings ]
* net: Enable OPENVSWITCH as module (Closes: #675010)
+ * aufs: Disable until it is updated for Linux 3.5
+ * rt: Disable until it is updated for Linux 3.5 or later
-- Ben Hutchings <ben at decadent.org.uk> Mon, 02 Jul 2012 15:09:43 +0100
Modified: dists/trunk/linux/debian/config/defines
==============================================================================
--- dists/trunk/linux/debian/config/defines Sat Jul 21 22:07:39 2012 (r19269)
+++ dists/trunk/linux/debian/config/defines Sat Jul 21 23:32:14 2012 (r19270)
@@ -24,7 +24,7 @@
compiler: gcc-4.6
featuresets:
none
- rt
+# rt
[featureset-rt_base]
enabled: true
Modified: dists/trunk/linux/debian/patches/debian/kernelvariables.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/kernelvariables.patch Sat Jul 21 22:07:39 2012 (r19269)
+++ dists/trunk/linux/debian/patches/debian/kernelvariables.patch Sat Jul 21 23:32:14 2012 (r19270)
@@ -13,7 +13,7 @@
--- a/Makefile
+++ b/Makefile
-@@ -195,46 +195,6 @@
+@@ -195,42 +195,6 @@ export KBUILD_BUILDHOST := $(SUBARCH)
ARCH ?= $(SUBARCH)
CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)
@@ -53,14 +53,10 @@
-# Where to locate arch specific headers
-hdr-arch := $(SRCARCH)
-
--ifeq ($(ARCH),m68knommu)
-- hdr-arch := m68k
--endif
--
KCONFIG_CONFIG ?= .config
export KCONFIG_CONFIG
-@@ -354,6 +314,44 @@
+@@ -349,6 +313,44 @@ CFLAGS_KERNEL =
AFLAGS_KERNEL =
CFLAGS_GCOV = -fprofile-arcs -ftest-coverage
Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series Sat Jul 21 22:07:39 2012 (r19269)
+++ dists/trunk/linux/debian/patches/series Sat Jul 21 23:32:14 2012 (r19270)
@@ -8,14 +8,14 @@
# 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
+#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
+#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
+#features/all/aufs3/aufs3-fix-export-__devcgroup_inode_permission.patch
bugfix/ia64/hardcode-arch-script-output.patch
bugfix/mips/disable-advansys.patch
@@ -41,7 +41,6 @@
bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch
bugfix/arm/ixp4xx_iobe.patch
debian/x86-memtest-WARN-if-bad-RAM-found.patch
-bugfix/alpha/alpha-add-io-read-write-16-32-be-functions.patch
features/all/fs-symlink-restrictions-on-sticky-directories.patch
features/all/fs-symlink-restrictions-on-sticky-directories-fix-2.patch
@@ -49,65 +48,8 @@
features/all/fs-hardlink-creation-restrictions-fix.patch
features/all/fs-hardlink-creation-restriction-cleanup.patch
-# Update wacom driver to 3.5ish
-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
-features/all/wacom/0027-wacom-do-not-crash-when-retrieving-touch_max.patch
-features/all/wacom/0028-wacom-leave-touch_max-as-is-if-predefined.patch
features/all/wacom/0029-wacom-do-not-request-tablet-data-on-MT-Tablet-PC-pen.patch
features/all/wacom/0030-wacom-ignore-new-style-Wacom-multi-touch-packets-on-.patch
-
-# Update be2net driver to 3.5ish
-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/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
-
-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/ia64/IA64-Export-asm-cmpxchg.h-to-userland.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
bugfix/x86/zsmalloc-Finish-conversion-to-a-separate-module.patch
-
features/all/cpu-devices/Partially-revert-cpufreq-Add-support-for-x86-cpuinfo.patch
-
-features/arm/kirkwood-fix-orion_gpio_set_blink.patch
-features/arm/kirkwood-create-a-generic-function-for-gpio-led-blinking.patch
-features/arm/kirkwood-add-iconnect-support.patch
-
-features/arm/net-drop-NET-dependency-from-HAVE_BPF_JIT.patch
More information about the Kernel-svn-changes
mailing list