1. 16 10月, 2007 32 次提交
  2. 15 10月, 2007 8 次提交
    • J
      [IA64] update sn2_defconfig · 432a7d65
      Jes Sorensen 提交于
      Update defonfig file for sn2 to match recent changes in config options.
      Signed-off-by: NJes Sorensen <jes@sgi.com>
      Signed-off-by: NTony Luck <tony.luck@intel.com>
      432a7d65
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched · b5869ce7
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: (140 commits)
        sched: sync wakeups preempt too
        sched: affine sync wakeups
        sched: guest CPU accounting: maintain guest state in KVM
        sched: guest CPU accounting: maintain stats in account_system_time()
        sched: guest CPU accounting: add guest-CPU /proc/<pid>/stat fields
        sched: guest CPU accounting: add guest-CPU /proc/stat field
        sched: domain sysctl fixes: add terminator comment
        sched: domain sysctl fixes: do not crash on allocation failure
        sched: domain sysctl fixes: unregister the sysctl table before domains
        sched: domain sysctl fixes: use for_each_online_cpu()
        sched: domain sysctl fixes: use kcalloc()
        Make scheduler debug file operations const
        sched: enable wake-idle on CONFIG_SCHED_MC=y
        sched: reintroduce topology.h tunings
        sched: allow the immediate migration of cache-cold tasks
        sched: debug, improve migration statistics
        sched: debug: increase width of debug line
        sched: activate task_hot() only on fair-scheduled tasks
        sched: reintroduce cache-hot affinity
        sched: speed up context-switches a bit
        ...
      b5869ce7
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · df3d80f5
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (207 commits)
        [SCSI] gdth: fix CONFIG_ISA build failure
        [SCSI] esp_scsi: remove __dev{init,exit}
        [SCSI] gdth: !use_sg cleanup and use of scsi accessors
        [SCSI] gdth: Move members from SCp to gdth_cmndinfo, stage 2
        [SCSI] gdth: Setup proper per-command private data
        [SCSI] gdth: Remove gdth_ctr_tab[]
        [SCSI] gdth: switch to modern scsi host registration
        [SCSI] gdth: gdth_interrupt() gdth_get_status() & gdth_wait() fixes
        [SCSI] gdth: clean up host private data
        [SCSI] gdth: Remove virt hosts
        [SCSI] gdth: Reorder scsi_host_template intitializers
        [SCSI] gdth: kill gdth_{read,write}[bwl] wrappers
        [SCSI] gdth: Remove 2.4.x support, in-kernel changelog
        [SCSI] gdth: split out pci probing
        [SCSI] gdth: split out eisa probing
        [SCSI] gdth: split out isa probing
        gdth: Make one abuse of scsi_cmnd less obvious
        [SCSI] NCR5380: Use scsi_eh API for REQUEST_SENSE invocation
        [SCSI] usb storage: use scsi_eh API in REQUEST_SENSE execution
        [SCSI] scsi_error: Refactoring scsi_error to facilitate in synchronous REQUEST_SENSE
        ...
      df3d80f5
    • L
      Merge branch 'agp-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/agp-2.6 · 3d06f7a5
      Linus Torvalds 提交于
      * 'agp-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/agp-2.6:
        fix use after free in amd create gatt pages
        AGP fix race condition between unmapping and freeing pages
      3d06f7a5
    • L
      Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 13626cb9
      Linus Torvalds 提交于
      * 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        via invalid device ids removal
        radeon: Commit the ring after each partial texture upload blit.
        i915: fix vbl swap allocation size.
        drm: Replace DRM_IOCTL_ARGS with (dev, data, file_priv) and remove DRM_DEVICE.
        drm: remove XFREE86_VERSION macros.
        drm: Replace filp in ioctl arguments with drm_file *file_priv.
        drm: Remove DRM_ERR OS macro.
      13626cb9
    • L
      Merge branch 'nfs-server-stable' of git://linux-nfs.org/~bfields/linux · 37ca506a
      Linus Torvalds 提交于
      * 'nfs-server-stable' of git://linux-nfs.org/~bfields/linux:
        knfsd: query filesystem for NFSv4 getattr of FATTR4_MAXNAME
        knfsd: nfsv4 delegation recall should take reference on client
        knfsd: don't shutdown callbacks until nfsv4 client is freed
        knfsd: let nfsd manage timing out its own leases
        knfsd: Add source address to sunrpc svc errors
        knfsd: 64 bit ino support for NFS server
        svcgss: move init code into separate function
        knfsd: remove code duplication in nfsd4_setclientid()
        nfsd warning fix
        knfsd: fix callback rpc cred
        knfsd: move nfsv4 slab creation/destruction to module init/exit
        knfsd: spawn kernel thread to probe callback channel
        knfsd: nfs4 name->id mapping not correctly parsing negative downcall
        knfsd: demote some printk()s to dprintk()s
        knfsd: cleanup of nfsd4 cmp_* functions
        knfsd: delete code made redundant by map_new_errors
        nfsd: fix horrible indentation in nfsd_setattr
        nfsd: remove unused cache_for_each macro
        nfsd: tone down inaccurate dprintk
      37ca506a
    • G
      PS3 system bus add_uevent_var() fallout · b9090071
      Geert Uytterhoeven 提交于
      Kill unused variables
      Signed-off-by: NGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b9090071
    • J
      HID: fix HIDIOCGRDESC memory access in hidraw · 57d292bd
      Jiri Kosina 提交于
      Fix bogus copying of data into userspace when HIDIOCGRDESC is issued.
      HID-transport layer makes sure that dev->hid->rdesc is not larger than
      HID_MAX_DESCRIPTOR_SIZE.
      Noticed-by: NAl Viro <viro@ftp.linux.org.uk>
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      57d292bd