1. 28 1月, 2008 36 次提交
  2. 27 1月, 2008 4 次提交
    • I
      printk: revert ktime_get() timestamps · 326e96b9
      Ingo Molnar 提交于
      revert 19ef9309.
      
      Kevin Winchester reported a lockup during X startup an bisected
      it to this commit.
      Reported-by: NKevin Winchester <kjwinchester@gmail.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      326e96b9
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · ef3f2de2
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] DFS build fixes
        [CIFS] DFS support: provide shrinkable mounts
        [CIFS] Do not log path names in lookup errors
        [CIFS] DFS support patchset: Added mountdata
        [CIFS] Forgot to add two new files from previous commit
        [CIFS] DNS name resolution helper upcall for cifs
        [CIFS] fix checkpatch warnings in fs/cifs/inode.c
        [CIFS] hold ses sem on tcp session reconnect during mount
        [CIFS] Allow setting mode via cifs acl
        [CIFS]  fix unicode string alignment in SPNEGO setup
        [CIFS] cifs_partialpagewrite() cleanup
        [CIFS]  use krb5 session key from first SMB session after a NegProt
        [CIFS] redo existing session setup if needed in cifs_mount
        [CIFS] Only dump SPNEGO key if CONFIG_CIFS_DEBUG2 is set
        [CIFS] fix SetEA failure to some Samba versions
      ef3f2de2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · 1c7c2cde
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (63 commits)
        ide: remove REQ_TYPE_ATA_CMD
        ide: switch ide_cmd_ioctl() to use REQ_TYPE_ATA_TASKFILE requests
        ide: switch set_xfer_rate() to use REQ_TYPE_ATA_TASKFILE requests
        ide: fix final status check in drive_cmd_intr()
        ide: check BUSY and ERROR status bits before reading data in drive_cmd_intr()
        ide: don't enable local IRQs for PIO-in in driver_cmd_intr() (take 2)
        ide: convert "empty" REQ_TYPE_ATA_CMD requests to use REQ_TYPE_ATA_TASKFILE
        ide: initialize rq->cmd_type in ide_init_drive_cmd() callers
        ide: use wait_drive_not_busy() in drive_cmd_intr() (take 2)
        ide: kill DATA_READY define
        ide: task_end_request() fix
        ide: use rq->nr_sectors in task_end_request()
        ide: remove needless ->cursg clearing from task_end_request()
        ide: set IDE_TFLAG_IN_* flags before queuing/executing command
        ide-tape: fix handling of non-special requests in ->end_request method
        ide: fix final status check in task_in_intr()
        ide: clear HOB bit for REQ_TYPE_ATA_CMD requests in ide_end_drive_cmd()
        ide: fix ->io_32bit race in ide_taskfile_ioctl()
        cmd64x: remove /proc/ide/cmd64x
        ide: remove broken disk byte-swapping support
        ...
      1c7c2cde
    • L
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 0444fa78
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (56 commits)
        [S390] replace lock_cpu_hotplug with get_online_cpus
        [S390] usage of s390dbf: shrink number of debug areas to use.
        [S390] constify function pointer tables.
        [S390] do local_irq_restore while spinning in spin_lock_irqsave.
        [S390] add smp_call_function_mask
        [S390] dasd: fix loop in request expiration handling
        [S390] Unused field / extern declaration in processor.h
        [S390] Remove TOPDIR from Makefile
        [S390] dasd: add hyper PAV support to DASD device driver, part 1
        [S390] single-step cleanup
        [S390] Move NOTES and BUG_TABLE.
        [S390] drivers/s390/: Spelling fixes
        [S390] include/asm-s390/: Spelling fixes
        [S390] arch/s390/: Spelling fixes
        [S390] Use diag308 subcodes 3 and 6 for reboot and dump when possible.
        [S390] vmemmap: allocate struct pages before 1:1 mapping
        [S390] Initialize sclp_ipl_info
        [S390] Allocate and free cpu lowcores and stacks when needed/possible.
        [S390] use LIST_HEAD instead of LIST_HEAD_INIT
        [S390] Load disabled wait psw instead of stopping cpu on halt.
        ...
      0444fa78