Linux kernel stable tree (mirror) https://git.radix-linux.su/kernel/linux.git/atom?h=v2.6.38-rc7 2011-03-01T21:55:12+00:00 2011-03-01T21:55:12+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-03-01T21:55:12+00:00 urn:sha1:dd9c1549edef02290edced639f67b54a25abbe0e 2011-03-01T21:23:27+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-03-01T21:23:27+00:00 urn:sha1:8d1dc20e8d689c7e6a0a4d2c94e36a99d5793ecb This reverts commit c4ff4b829ef9e6353c0b133b7adb564a68054979. Ted Ts'o reports: "TPM is working for me so I can log into employer's network in 2.6.37. It broke when I tried 2.6.38-rc6, with the following relevant lines from my dmesg: [ 11.081627] tpm_tis 00:0b: 1.2 TPM (device-id 0x0, rev-id 78) [ 25.734114] tpm_tis 00:0b: Operation Timed out [ 78.040949] tpm_tis 00:0b: Operation Timed out This caused me to get suspicious, especially since the _other_ TPM commit in 2.6.38 had already been reverted, so I tried reverting commit c4ff4b829e: "TPM: Long default timeout fix". With this commit reverted, my TPM on my Lenovo T410 is once again working." Requested-and-tested-by: Theodore Ts'o <tytso@mit.edu> Acked-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 2011-03-01T02:09:02+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-03-01T02:09:02+00:00 urn:sha1:3e1f2356ce231488dc1fa844e5ce91bcb59fc2a1 * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: hwmon: (adt7411) add MODULE_DEVICE_TABLE hwmon: (ad7414) add MODULE_DEVICE_TABLE 2011-03-01T02:08:31+00:00 Randy Dunlap randy.dunlap@oracle.com 2011-02-26T18:54:00+00:00 urn:sha1:e6eb5ce1b202ac9cdcfda5be559c9b9d8ec7542c Fix new kernel-doc warning in fs/block_dev.c: Warning(fs/block_dev.c:937): No description found for parameter 'kill_dirty' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 2011-03-01T02:00:31+00:00 Rafael J. Wysocki rjw@sisk.pl 2011-03-01T00:12:19+00:00 urn:sha1:af06216a8ef1c430cc6ad22b562f3a11a512c5dd Several ACPI drivers fail to build if CONFIG_NET is unset, because they refer to things depending on CONFIG_THERMAL that in turn depends on CONFIG_NET. However, CONFIG_THERMAL doesn't really need to depend on CONFIG_NET, because the only part of it requiring CONFIG_NET is the netlink interface in thermal_sys.c. Put the netlink interface in thermal_sys.c under #ifdef CONFIG_NET and remove the dependency of CONFIG_THERMAL on CONFIG_NET from drivers/thermal/Kconfig. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Len Brown <lenb@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Luming Yu <luming.yu@intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 2011-03-01T01:58:09+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-03-01T01:58:09+00:00 urn:sha1:dbc39ec4b69de34e2c2c937131649cc4a104283f * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: fix unsigned vs signed comparison issue in modeset ctl ioctl. drm/nv50-nvc0: make sure vma is definitely unmapped when destroying bo 2011-03-01T01:57:30+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-03-01T01:57:30+00:00 urn:sha1:4f427634b127f5fdc4e9fd2e5780f0a6caef936b * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: omap4: prcm: Fix the CPUx clockdomain offsets OMAP2+: clocksource: fix crash on boot when !CONFIG_OMAP_32K_TIMER OMAP2/3: clock: fix fint calculation for DPLL_FREQSEL OMAP2+: mailbox: fix lookups for multiple mailboxes OMAP2420: mailbox: fix IVA vs DSP IRQ numbering mach-omap2: smartreflex: world-writable debugfs voltage files mach-omap2: pm: world-writable debugfs timer files mach-omap2: mux: world-writable debugfs files 2011-03-01T01:55:08+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-03-01T01:55:08+00:00 urn:sha1:7f233dee2149245bc7ee1194c31a04ea43cd127e * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf timechart: Fix max number of cpus perf timechart: Fix black idle boxes in the title perf hists: Print number of samples, not the period sum * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Use u32 instead of long to set reset vector back to 0 * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: clockevents: Prevent oneshot mode when broadcast device is periodic 2011-03-01T01:53:04+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-03-01T01:53:04+00:00 urn:sha1:58da94f0139d848884ec4827593f1082276bbbf8 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: fix truncate after open fuse: fix hang of single threaded fuseblk filesystem 2011-03-01T01:52:47+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-03-01T01:52:47+00:00 urn:sha1:158a5d61f780b707da0b559cf60d72294006aa97 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2: Check heartbeat mode for kernel stacks only Ocfs2/refcounttree: Fix a bug for refcounttree to writeback clusters in a right number. ocfs2: Fix estimate of necessary credits for mkdir