commit 10387e5eb45c6e48d67102b88229f5bc6037461c tree 77b305e7db8aa0b8b451c96f33aed66bf1a8a50f parent ebd6c17109aed086908ae3b0949265fd07712659 parent d279490543ee4e7c51371eb605b578ab47f45305 author Linus Torvalds Wed, 06 Sep 2006 11:00:59 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:59 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] myri10ge: update the firmware download URL in Kconfig commit ebd6c17109aed086908ae3b0949265fd07712659 tree 7a1af4b2ac8b6ce062206d0e967272d2ae457ff6 parent b4a228346c1a7d09f565e750d2e988c5671e9fa3 author john stultz Wed, 06 Sep 2006 11:02:45 +0100 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -0700 [PATCH] FRV: Use the generic time stuff for FRV Use the generic time stuff for FRV. Signed-off-by: John Stultz Signed-Off-By: David Howells Signed-off-by: Linus Torvalds commit b4a228346c1a7d09f565e750d2e988c5671e9fa3 tree 8e6340f140da2f0b59457f40ed4ee6dc6dee6f6b parent bb98ad77d8451a3ccf9478738ffe7ec63394fcdf author David Woodhouse Wed, 06 Sep 2006 09:03:26 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -0700 [PATCH] Remove unneeded asm-i386/cpufeature.h from user visibility. Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit bb98ad77d8451a3ccf9478738ffe7ec63394fcdf tree f642ce106f26e5ff13d6994555425a084f906b56 parent 068c4579fe5c21e84c7cb2ba89db80899e25104e author Ismail Donmez Wed, 06 Sep 2006 00:03:44 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -0700 [PATCH] Move linux/device.h include in linux/atmdev.h to #ifdef __KERNEL__ section linux/device.h header is not included in the David Woodhouse's kernel-headers git tree which is used for userspace kernel headers. Which results in compile errors when building iproute2. Attached patch moves linux/device.h include under the #ifdef __KERNEL__ section. Signed-off-by: Ismail Donmez Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 068c4579fe5c21e84c7cb2ba89db80899e25104e tree ab16bf723c648d936cefb89b6dc6634145668b86 parent 471b40d0dfc17bf0161629950b82524d41bc37ce author Ingo Molnar Wed, 06 Sep 2006 00:03:44 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -0700 [PATCH] lockdep: do not touch console state when tainting the kernel Remove an unintended console_verbose() side-effect from add_taint(). Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 471b40d0dfc17bf0161629950b82524d41bc37ce tree 1f3a95ec7a182e313556afe16d8107444d090fa8 parent 96dd7421a06a5bc6eb731323b95efcb2fd864854 author Pavel Machek Wed, 06 Sep 2006 00:03:43 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -0700 [PATCH] prevent swsusp with PAE PAE + swsusp results in hard-to-debug crash about 50% of time during resume. Cause is known, fix needs to be ported from x86-64 (but we can't make it to 2.6.18, and I'd like this to be worked around in 2.6.18). Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96dd7421a06a5bc6eb731323b95efcb2fd864854 tree a450951e439f897ee92ba6b068efb77c0edc6a1a parent fe2bbc4832659b7ffc867cac03e0a92ae81e11e4 author Thomas Gleixner Wed, 06 Sep 2006 00:03:42 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -0700 [PATCH] prevent timespec/timeval to ktime_t overflow Frank v. Waveren pointed out that on 64bit machines the timespec to ktime_t conversion might overflow. This is also true for timeval to ktime_t conversions. This breaks a "sleep inf" on 64bit machines. While a timespec/timeval with tx.sec = MAX_LONG is valid by specification the internal representation of ktime_t is based on nanoseconds. The conversion of seconds to nanoseconds overflows for seconds values >= (MAX_LONG / NSEC_PER_SEC). Check the seconds argument to the conversion and limit it to the maximum time which can be represented by ktime_t. Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: Frank v Waveren Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe2bbc4832659b7ffc867cac03e0a92ae81e11e4 tree 9c0ece0fd67295acb4230d1f9da729db26a00a48 parent 6dba28379edc08327ede01ff41bd3c9dd46a7fa0 author Henrik Kretzschmar Wed, 06 Sep 2006 00:03:41 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:01 -0700 [PATCH] add missing desctiption in super.c Adds kernel-doc for alloc_super() type in fs/super.c. Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6dba28379edc08327ede01ff41bd3c9dd46a7fa0 tree 945418feebb2dcf4387ce86bf57a6c4f757e7b43 parent fc47e7b592dc45b03c27b0a4c8f2d215dae9944d author Henrik Kretzschmar Wed, 06 Sep 2006 00:03:40 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:01 -0700 [PATCH] Documentation for lock_key in struct hrtimer_base Fixes an error message on make xmldocs. Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc47e7b592dc45b03c27b0a4c8f2d215dae9944d tree 54ea55d491e2f708bc23655041668e19da3de619 parent c336923b668fdcf0312efbec3b44895d713f4d81 author Jarek Poplawski Wed, 06 Sep 2006 00:03:39 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:01 -0700 [PATCH] lockdep ifdef fix With CONFIG_SMP=y CONFIG_PREEMPT=y CONFIG_LOCKDEP=y CONFIG_DEBUG_LOCK_ALLOC=y # CONFIG_PROVE_LOCKING is not set spin_unlock_irqrestore() goes through lockdep but spin_lock_irqsave() doesn't. Apparently, bad things happen. Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d279490543ee4e7c51371eb605b578ab47f45305 tree 45217be4f3e2b6938d7b330cda6eb0a9a2cedf12 parent c336923b668fdcf0312efbec3b44895d713f4d81 author Brice Goglin Tue, 05 Sep 2006 21:58:50 -0400 committer Jeff Garzik Wed, 06 Sep 2006 11:04:26 -0400 [PATCH] myri10ge: update the firmware download URL in Kconfig Update the firmware download URL in Kconfig to match the header in drivers/net/myri10ge/myri10ge.c. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik