[kernel: 48/48] Merge branch 'kernel-git' strategy 'theirs'
Kyle McMartin
kyle at fedoraproject.org
Thu Dec 9 18:35:05 UTC 2010
commit a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf
Merge: ee99a68 98e6119
Author: Kyle McMartin <kyle at redhat.com>
Date: Thu Dec 9 13:29:24 2010 -0500
Merge branch 'kernel-git' strategy 'theirs'
Conflicts:
xhci_hcd-suspend-resume.patch
.gitignore | 4 +-
Makefile | 10 +-
acpi-ec-add-delay-before-write.patch | 5 +-
...-battery-information-on-notification-0x81.patch | 4 +-
btusb-macbookpro-6-2.patch | 41 -
btusb-macbookpro-7-1.patch | 42 -
config-arm | 7 +
config-debug | 6 +-
config-generic | 107 ++-
config-nodebug | 12 +-
config-powerpc-generic | 2 +
config-s390x | 5 +
config-sparc64-generic | 2 +
config-x86-generic | 21 +-
config-x86_64-generic | 18 +
debug-tty-print-dev-name.patch | 14 +-
drm-intel-big-hammer.patch | 21 +-
drm-intel-edp-fixes.patch | 44 +
drm-intel-make-lvds-work.patch | 22 +-
hdpvr-ir-enable.patch | 15 +-
kernel.spec | 233 ++---
linux-2.6-32bit-mmap-exec-randomization.patch | 2 +-
linux-2.6-bluetooth-autosuspend.patch | 159 ---
linux-2.6-crash-driver.patch | 24 +-
linux-2.6-enable-more-pci-autosuspend.patch | 276 ++---
linux-2.6-i386-nx-emulation.patch | 2 +-
linux-2.6-qcserial-autosuspend.patch | 23 -
linux-2.6-utrace-ptrace.patch | 35 +-
linux-2.6-utrace.patch | 6 +-
linux-2.6-uvc-autosuspend.patch | 22 -
pci-crs-fixes.patch | 593 ---------
runtime_pm_fixups.patch | 2 +-
sources | 4 +-
wacom-01-add-fuzz-parameters-to-features.patch | 69 --
wacom-02-parse-the-bamboo-device-family.patch | 122 --
...ollect-device-quirks-into-single-function.patch | 107 --
...add-support-for-the-bamboo-touch-trackpad.patch | 172 ---
...a-quirk-for-low-resolution-bamboo-devices.patch | 69 --
wacom-06-request-tablet-data-for-bamboo-pens.patch | 55 -
...move-bamboo-touch-irq-to-its-own-function.patch | 52 -
wacom-08-add-support-for-bamboo-pen.patch | 130 --
...le-bamboo-touchpad-when-pen-is-being-used.patch | 31 -
xhci_hcd-suspend-resume.patch | 1289 --------------------
43 files changed, 484 insertions(+), 3395 deletions(-)
---
diff --cc config-nodebug
index b4472f9,ab9c209..3f28994
--- a/config-nodebug
+++ b/config-nodebug
@@@ -61,33 -61,34 +61,34 @@@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=
# off in both production debug and nodebug builds,
# on in rawhide nodebug builds
-CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_EXT4_DEBUG=y
+# CONFIG_EXT4_DEBUG is not set
-CONFIG_DEBUG_PERF_USE_VMALLOC=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_JBD2_DEBUG=y
+# CONFIG_JBD2_DEBUG is not set
-CONFIG_DEBUG_CFQ_IOSCHED=y
+# CONFIG_DEBUG_CFQ_IOSCHED is not set
-CONFIG_DRBD_FAULT_INJECTION=y
+# CONFIG_DRBD_FAULT_INJECTION is not set
- # CONFIG_ATH_DEBUG is not set
- # CONFIG_IWLWIFI_DEVICE_TRACING is not set
+ CONFIG_ATH_DEBUG=y
+ CONFIG_CARL9170_DEBUGFS=y
+ CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_DEBUG_OBJECTS_WORK=y
-CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_OBJECTS_WORK is not set
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-CONFIG_DMADEVICES_DEBUG=y
-CONFIG_DMADEVICES_VDEBUG=y
+# CONFIG_DMADEVICES_DEBUG is not set
+# CONFIG_DMADEVICES_VDEBUG is not set
CONFIG_PM_ADVANCED_DEBUG=y
- # CONFIG_CEPH_FS_PRETTYDEBUG is not set
- # CONFIG_QUOTA_DEBUG is not set
+ CONFIG_CEPH_LIB_PRETTYDEBUG=y
+ CONFIG_QUOTA_DEBUG=y
-# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
CONFIG_PCI_DEFAULT_USE_CRS=y
diff --cc kernel.spec
index 8b30de6,be5fcc0..36dda5f
--- a/kernel.spec
+++ b/kernel.spec
@@@ -654,8 -650,12 +654,10 @@@ Patch1555: fix_xen_guest_on_old_EC2.pat
# nouveau + drm fixes
Patch1810: drm-nouveau-updates.patch
Patch1819: drm-intel-big-hammer.patch
-# intel drm is all merged upstream
-Patch1824: drm-intel-next.patch
# make sure the lvds comes back on lid open
Patch1825: drm-intel-make-lvds-work.patch
+ Patch1826: drm-intel-edp-fixes.patch
+
Patch1900: linux-2.6-intel-iommu-igfx.patch
# linux1394 git patches
@@@ -713,34 -699,16 +701,33 @@@ Patch12203: linux-2.6-usb-pci-autosuspe
Patch12204: linux-2.6-enable-more-pci-autosuspend.patch
Patch12205: runtime_pm_fixups.patch
- Patch12225: pci-crs-fixes.patch
- Patch12226: x86-never-alloc-pci-from-the-last-1M-below-4G.patch
+ Patch12303: dmar-disable-when-ricoh-multifunction.patch
- Patch12300: btusb-macbookpro-7-1.patch
- Patch12301: btusb-macbookpro-6-2.patch
- Patch12304: add-macbookair3-ids.patch
+ Patch12401: debug-tty-print-dev-name.patch
- Patch12303: dmar-disable-when-ricoh-multifunction.patch
+ Patch12410: mm-page-allocator-adjust-the-per-cpu-counter-threshold-when-memory-is-low.patch
+ Patch12411: mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds.patch
- Patch12305: xhci_hcd-suspend-resume.patch
+ # rhbz#650934
+ Patch12420: sched-cure-more-NO_HZ-load-average-woes.patch
+Patch12308: fix-i8k-inline-asm.patch
+
+Patch12405: inet_diag-make-sure-we-run-the-same-bytecode-we-audited.patch
+Patch12408: netlink-make-nlmsg_find_attr-take-a-const-ptr.patch
+
+Patch12406: posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch
+
+Patch12410: tty-make-tiocgicount-a-handler.patch
+Patch12411: tty-icount-changeover-for-other-main-devices.patch
+
+Patch12413: tpm-autodetect-itpm-devices.patch
+
+Patch12420: mm-page-allocator-adjust-the-per-cpu-counter-threshold-when-memory-is-low.patch
+Patch12421: mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds.patch
+
+Patch12430: sched-cure-more-NO_HZ-load-average-woes.patch
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@@ -1347,39 -1298,13 +1318,35 @@@ ApplyPatch runtime_pm_fixups.patc
# rhbz#605888
ApplyPatch dmar-disable-when-ricoh-multifunction.patch
- ApplyPatch xhci_hcd-suspend-resume.patch
+ # rhbz#630464
+ ApplyPatch debug-tty-print-dev-name.patch
+
+ # backport some fixes for kswapd from mmotm, rhbz#649694
+ ApplyPatch mm-page-allocator-adjust-the-per-cpu-counter-threshold-when-memory-is-low.patch
+ ApplyPatch mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds.patch
+ApplyPatch fix-i8k-inline-asm.patch
+
+# rhbz#651264 (CVE-2010-3880)
+ApplyPatch inet_diag-make-sure-we-run-the-same-bytecode-we-audited.patch
+ApplyPatch netlink-make-nlmsg_find_attr-take-a-const-ptr.patch
+
+# rhbz#656264
+ApplyPatch posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch
+
+# CVE-2010-4077, CVE-2010-4075 (rhbz#648660, #648663)
+ApplyPatch tty-make-tiocgicount-a-handler.patch
+ApplyPatch tty-icount-changeover-for-other-main-devices.patch
+
+ApplyPatch tpm-autodetect-itpm-devices.patch
+
+# backport some fixes for kswapd from mmotm, rhbz#649694
+ApplyPatch mm-page-allocator-adjust-the-per-cpu-counter-threshold-when-memory-is-low.patch
+ApplyPatch mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds.patch
+
+# rhbz#650934
+ApplyPatch sched-cure-more-NO_HZ-load-average-woes.patch
+
# END OF PATCH APPLICATIONS
%endif
More information about the scm-commits
mailing list