Linus Torvalds
5f34fe1cfc
Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ...
* 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (63 commits)
stacktrace: provide save_stack_trace_tsk() weak alias
rcu: provide RCU options on non-preempt architectures too
printk: fix discarding message when recursion_bug
futex: clean up futex_(un)lock_pi fault handling
"Tree RCU": scalable classic RCU implementation
futex: rename field in futex_q to clarify single waiter semantics
x86/swiotlb: add default swiotlb_arch_range_needs_mapping
x86/swiotlb: add default phys<->bus conversion
x86: unify pci iommu setup and allow swiotlb to compile for 32 bit
x86: add swiotlb allocation functions
swiotlb: consolidate swiotlb info message printing
swiotlb: support bouncing of HighMem pages
swiotlb: factor out copy to/from device
swiotlb: add arch hook to force mapping
swiotlb: allow architectures to override phys<->bus<->phys conversions
swiotlb: add comment where we handle the overflow of a dma mask on 32 bit
rcu: fix rcutorture behavior during reboot
resources: skip sanity check of busy resources
swiotlb: move some definitions to header
swiotlb: allow architectures to override swiotlb pool allocation
...
Fix up trivial conflicts in
arch/x86/kernel/Makefile
arch/x86/mm/init_32.c
include/linux/hardirq.h
as per Ingo's suggestions.
2008-12-30 16:10:19 -08:00
2008-11-12 17:17:18 -08:00
2008-10-30 11:38:45 -07:00
2008-11-07 21:45:29 -05:00
2008-02-08 09:22:31 -08:00
2008-12-15 10:34:58 +00:00
2008-10-30 11:38:45 -07:00
2008-10-13 14:07:19 +08:00
2008-10-16 12:18:16 -07:00
2008-11-14 17:28:53 +00:00
2008-10-10 08:22:44 +02:00
2008-11-12 17:17:16 -08:00
2008-10-30 11:38:45 -07:00
2007-07-19 10:04:47 -07:00
2008-11-11 12:13:28 +01:00
2008-12-22 18:44:47 +09:00
2008-02-14 00:16:13 -05:00
2008-10-16 11:21:30 -07:00
2008-01-11 08:16:14 +11:00
2008-10-16 11:51:30 -06:00
2008-04-25 13:27:03 +01:00
2008-11-22 02:49:48 +01:00
2008-02-02 15:14:49 -08:00
2008-01-25 19:05:22 -02:00
2008-04-21 22:19:05 +00:00
2007-07-16 09:05:45 -07:00
2008-10-16 11:21:44 -07:00
Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc', 'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io', 'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace', 'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal', 'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core
2008-12-23 16:27:23 +01:00
2008-04-21 22:23:30 +00:00
2008-02-03 15:54:28 +02:00
2008-11-12 17:17:17 -08:00
2008-10-30 15:55:47 +01:00
2007-05-09 08:58:19 +02:00
2008-10-30 11:38:45 -07:00
2008-04-27 15:38:30 +02:00
2007-10-09 19:59:15 -07:00
2008-11-11 11:41:49 -05:00
2008-11-14 17:28:53 +00:00
2008-10-30 11:38:47 -07:00
2008-10-29 15:03:50 -07:00
2008-12-03 21:32:00 +01:00
2008-10-22 15:01:22 +11:00
2007-12-17 10:33:19 -08:00
2008-10-23 00:11:07 -04:00
2008-10-31 11:24:27 +11:00
2008-01-11 18:22:30 -06:00
2007-10-17 08:43:05 -07:00
2008-04-26 22:25:22 +02:00
2008-02-08 09:22:30 -08:00
2008-08-16 10:55:33 +01:00
2007-11-29 09:24:53 -08:00
2007-05-09 08:57:56 +02:00
2008-12-08 01:19:06 -08:00
2008-11-14 17:28:53 +00:00
2008-10-30 11:38:45 -07:00
2008-10-16 11:21:29 -07:00
2008-12-16 15:29:15 -08:00
2008-04-19 19:19:55 +02:00
2008-12-30 16:10:19 -08:00
2008-10-10 21:33:49 +02:00
2008-12-28 12:27:58 -08:00
2008-10-30 11:38:47 -07:00
2008-11-14 17:28:53 +00:00
2008-12-22 18:44:05 +09:00
2008-12-25 11:40:30 +01:00
2008-08-29 02:15:25 -07:00
2008-12-01 19:55:24 -08:00
2008-10-29 15:03:49 -07:00
2008-07-22 19:24:29 +10:00
2008-04-29 02:49:47 -04:00
2008-07-31 18:45:41 +02:00
2008-11-23 20:33:24 +01:00
2006-11-30 04:58:40 +01:00
2008-12-17 10:49:14 -08:00
2008-11-11 08:11:24 -02:00
2008-10-30 11:38:45 -07:00
2008-11-12 17:17:18 -08:00
2008-10-30 11:38:45 -07:00
Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc', 'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io', 'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace', 'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal', 'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core
2008-12-23 16:27:23 +01:00
2008-01-24 20:40:04 -08:00
2008-11-15 11:51:03 -08:00
2008-02-23 17:52:36 -08:00
2007-05-09 08:58:19 +02:00
2008-04-30 08:29:52 -07:00
2008-07-25 10:53:30 -07:00
2008-02-06 10:41:09 -08:00
2008-11-12 17:17:18 -08:00
2007-10-19 11:53:34 -07:00
2007-08-02 13:50:43 -04:00
2008-07-25 10:53:29 -07:00
2008-08-12 16:07:28 -07:00
2007-03-01 14:53:39 -08:00
2008-10-20 08:52:34 -07:00
2008-06-13 10:09:46 +02:00
2008-11-14 10:39:26 +11:00
2008-02-03 15:27:38 +02:00
2008-04-18 17:55:33 +02:00
2006-10-03 22:52:05 +02:00
2008-10-17 14:40:51 -07:00
2008-12-01 19:55:24 -08:00
2008-07-22 10:39:36 +10:00
2006-11-30 04:55:36 +01:00
2008-09-23 08:09:14 -07:00
2008-10-16 11:21:31 -07:00
2008-07-26 12:00:06 -07:00
2006-11-30 04:58:40 +01:00
2008-11-06 15:41:19 -08:00
2006-10-03 22:57:56 +02:00
2008-12-28 12:49:40 -08:00
2008-11-28 13:15:14 +01:00
2008-10-16 11:21:40 -07:00
2008-04-21 15:10:15 -07:00
2008-10-16 11:21:32 -07:00
2008-03-24 19:22:19 -07:00
2008-11-12 17:17:18 -08:00
2008-02-03 14:54:41 +02:00
2008-07-26 12:00:06 -07:00
2008-11-03 18:21:44 +01:00
2008-07-26 12:00:06 -07:00
2007-10-18 14:37:32 -07:00
2008-06-05 15:18:30 +02:00
2007-10-20 02:37:21 +02:00
2008-08-26 10:26:54 +02:00
2008-06-06 11:29:10 -07:00
2008-12-28 12:33:21 -08:00
2008-04-29 08:06:16 -07:00
2008-07-26 12:00:06 -07:00
2008-10-16 09:24:52 -07:00
2008-06-26 03:35:46 -05:00
2008-02-06 10:41:09 -08:00
2007-05-21 09:58:40 -07:00
2008-07-26 12:00:06 -07:00
2008-12-01 13:51:26 +01:00
2006-10-11 11:14:24 -07:00
2008-10-20 15:43:10 +02:00
2008-04-21 15:10:15 -07:00
2008-08-12 16:07:30 -07:00
2008-10-30 11:38:46 -07:00
2008-11-28 16:47:41 +01:00
2008-03-17 09:03:05 +01:00
2008-07-21 14:22:18 +10:00
2008-05-14 10:05:18 -07:00
2007-10-22 08:13:17 -07:00
2006-10-03 22:53:09 +02:00
2007-10-20 00:15:26 +02:00
2008-10-30 19:07:04 +01:00
2006-09-27 08:26:15 -07:00
2008-04-29 08:05:59 -07:00
2007-11-26 19:39:01 -08:00
2006-10-03 23:39:02 +02:00
2008-01-24 20:40:04 -08:00
2008-11-12 17:17:17 -08:00
2006-10-03 22:57:56 +02:00
2007-02-11 10:51:35 -08:00
2008-10-31 19:00:09 -04:00
2006-11-30 04:58:40 +01:00
2006-11-30 05:21:10 +01:00
2006-10-01 00:39:24 -07:00
2008-02-06 10:41:14 -08:00
2008-10-16 11:21:32 -07:00
2008-08-27 08:54:08 +10:00
2007-10-17 08:43:06 -07:00
2008-02-05 09:44:20 -08:00
2008-07-25 22:12:39 +02:00
2008-04-11 13:21:14 -06:00
2007-07-30 14:25:12 -07:00
2008-10-29 15:03:49 -07:00
2008-10-16 11:21:32 -07:00
2008-10-16 11:21:32 -07:00
2008-10-16 12:18:16 -07:00
2008-07-21 21:54:59 -07:00
2008-10-20 13:19:56 -07:00
2008-11-29 15:13:42 +01:00
2008-07-25 10:53:27 -07:00
2006-10-03 22:57:56 +02:00
2006-12-20 01:46:58 -05:00
2008-07-26 12:00:06 -07:00
5f34fe1cfc
