mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-22 03:02:09 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
decbb280bb8e3bceebcf5defb4f61dfbfdb23e18
linux/drivers/char
History
Linus Torvalds 8d1dc20e8d Revert "TPM: Long default timeout fix" 
This reverts commit c4ff4b829e.

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-01 13:23:27 -08:00
..
agp
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel into drm-fixes
2011-02-24 12:19:43 +10:00
hw_random
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2011-01-13 10:25:58 -08:00
ip2
ip2: fix compiler warning on ip2main_pci_tbl
2010-12-10 15:20:15 -08:00
ipmi
char/ipmi: fix OOPS caused by pnp_unregister_driver on unregistered driver
2011-02-10 18:00:21 -08:00
mwave
drivers/char/mwave/Makefile: clean up
2010-10-27 18:03:15 -07:00
pcmcia
cm4000_cs: Fix undefined ops warning
2011-02-19 12:22:36 +01:00
rio
drivers/char/rio/Makefile: replace the use of <module>-objs with <module>-y
2010-10-27 18:03:15 -07:00
tpm
Revert "TPM: Long default timeout fix"
2011-03-01 13:23:27 -08:00
xilinx_hwicap
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
amiserial.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
apm-emulation.c
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
applicom.c
drivers/char/applicom.c: fix information leak to userland
2010-10-27 18:03:14 -07:00
applicom.h
…
bfin_jtag_comm.c
console: rename acquire/release_console_sem() to console_lock/unlock()
2011-01-26 10:50:06 +10:00
bfin-otp.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
briq_panel.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
bsr.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
cd1865.h
…
cyclades.c
tty: icount changeover for other main devices
2010-10-22 10:20:05 -07:00
digi1.h
…
digiFep1.h
…
digiPCI.h
…
ds1302.c
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
ds1620.c
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
dsp56k.c
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
dtlk.c
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
efirtc.c
efirtc: explicitly set llseek to no_llseek
2009-12-16 07:19:59 -08:00
epca.c
epca: Kill the big kernel lock
2010-08-10 13:47:40 -07:00
epca.h
epca: use tty_port
2008-07-20 17:12:36 -07:00
epcaconfig.h
…
generic_nvram.c
drivers: autoconvert trivial BKL users to private mutex
2010-10-05 15:01:04 +02:00
generic_serial.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
genrtc.c
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
hangcheck-timer.c
Input: sysrq - drop tty argument form handle_sysrq()
2010-08-21 00:34:45 -07:00
hpet.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
i8k.c
Fix gcc 4.5.1 miscompiling drivers/char/i8k.c (again)
2010-11-15 13:27:06 -08:00
isicom.c
isicom: kill off the BKL
2010-08-10 13:47:40 -07:00
istallion.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
Kconfig
Merge branch 'akpm'
2011-01-20 17:02:14 -08:00
lp.c
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
Makefile
virtio: console: Move file back to drivers/char/
2011-02-03 14:43:12 -08:00
mbcs.c
drivers: autoconvert trivial BKL users to private mutex
2010-10-05 15:01:04 +02:00
mbcs.h
MBCS: convert dmareadlock to mutex
2008-02-07 08:42:25 -08:00
mem.c
vfs: introduce FMODE_UNSIGNED_OFFSET for allowing negative f_pos
2010-10-25 21:18:21 -04:00
misc.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
mmtimer.c
SGI Altix IA64 mmtimer: eliminate long interval timer holdoffs
2010-10-27 18:03:14 -07:00
moxa.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
moxa.h
Char: moxa, cleanup rx/tx
2008-04-30 08:29:43 -07:00
mspec.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
mxser.c
drivers/char/mxser.c: fix compilation warning in mxser.c
2010-10-27 18:03:15 -07:00
mxser.h
mxser: convert large macros to functions
2008-04-30 08:29:49 -07:00
nozomi.c
nozomi: Fix warning from the previous TIOCGCOUNT changes
2010-11-09 14:49:38 -08:00
nsc_gpio.c
…
nvram.c
drivers: autoconvert trivial BKL users to private mutex
2010-10-05 15:01:04 +02:00
nwbutton.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
nwbutton.h
…
nwflash.c
drivers: autoconvert trivial BKL users to private mutex
2010-10-05 15:01:04 +02:00
pc8736x_gpio.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
ppdev.c
drivers/char/ppdev.c: fix information leak to userland
2010-10-27 18:03:14 -07:00
ps3flash.c
drop unused dentry argument to ->fsync
2010-05-27 22:05:02 -04:00
ramoops.c
ramoops: fix types, remove typecasts
2011-01-13 08:03:23 -08:00
random.c
random: Use this_cpu_inc_return
2010-12-17 15:18:05 +01:00
raw.c
block: make blkdev_get/put() handle exclusive access
2010-11-13 11:55:17 +01:00
riscom8_reg.h
…
riscom8.c
riscom8: kill use of lock_kernel
2010-08-10 13:47:40 -07:00
riscom8.h
tty: add more tty_port fields
2008-07-20 17:12:38 -07:00
rocket_int.h
tty: rocketport uses different port flags to everyone else
2009-01-02 10:19:39 -08:00
rocket.c
rocket: fix compiler warning on rocket_pci_ids
2010-12-10 15:20:14 -08:00
rocket.h
tty: rocketport uses different port flags to everyone else
2009-01-02 10:19:39 -08:00
rtc.c
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
scc.h
m68k: atari - Rename "mfp" to "st_mfp"
2009-02-22 09:23:02 -08:00
scx200_gpio.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
ser_a2232.c
headers: remove sched.h from interrupt.h
2009-10-11 11:20:58 -07:00
ser_a2232.h
…
ser_a2232fw.ax
…
ser_a2232fw.h
…
serial167.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
snsc_event.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
snsc.c
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
snsc.h
headers: kobject.h redux
2011-01-10 08:51:44 -08:00
sonypi.c
sonypi: don't use flush_scheduled_work()
2010-12-24 15:59:07 +01:00
specialix_io8.h
tty: add more tty_port fields
2008-07-20 17:12:38 -07:00
specialix.c
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-01-07 14:39:20 -08:00
stallion.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
sx.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
sx.h
Char: char/serial, remove SERIAL_TYPE_NORMAL redefines
2008-02-07 08:42:33 -08:00
sxboards.h
…
sxwindow.h
…
synclink_gt.c
drivers/char/synclink_gt.c: add extended sync feature
2010-10-27 18:03:14 -07:00
synclink.c
tty: icount changeover for other main devices
2010-10-22 10:20:05 -07:00
synclinkmp.c
tty: icount changeover for other main devices
2010-10-22 10:20:05 -07:00
tb0219.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
tlclk.c
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
toshiba.c
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
ttyprintk.c
add ttyprintk driver
2010-10-22 10:20:02 -07:00
uv_mmtimer.c
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
viotape.c
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
virtio_console.c
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-02-10 12:19:58 -08:00
vme_scc.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00