1. 01 1月, 2009 22 次提交
  2. 31 12月, 2008 18 次提交
    • R
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 · 2ca1a615
      Rusty Russell 提交于
      Conflicts:
      
      	arch/x86/kernel/io_apic.c
      2ca1a615
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 6a94cb73
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs: (184 commits)
        [XFS] Fix race in xfs_write() between direct and buffered I/O with DMAPI
        [XFS] handle unaligned data in xfs_bmbt_disk_get_all
        [XFS] avoid memory allocations in xfs_fs_vcmn_err
        [XFS] Fix speculative allocation beyond eof
        [XFS] Remove XFS_BUF_SHUT() and friends
        [XFS] Use the incore inode size in xfs_file_readdir()
        [XFS] set b_error from bio error in xfs_buf_bio_end_io
        [XFS] use inode_change_ok for setattr permission checking
        [XFS] add a FMODE flag to make XFS invisible I/O less hacky
        [XFS] resync headers with libxfs
        [XFS] simplify projid check in xfs_rename
        [XFS] replace b_fspriv with b_mount
        [XFS] Remove unused tracing code
        [XFS] Remove unnecessary assertion
        [XFS] Remove unused variable in ktrace_free()
        [XFS] Check return value of xfs_buf_get_noaddr()
        [XFS] Fix hang after disallowed rename across directory quota domains
        [XFS] Fix compile with CONFIG_COMPAT enabled
        move inode tracing out of xfs_vnode.
        move vn_iowait / vn_iowake into xfs_aops.c
        ...
      6a94cb73
    • L
      Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · f57fa1d6
      Linus Torvalds 提交于
      * git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (70 commits)
        fs/nfs/nfs4proc.c: make nfs4_map_errors() static
        rpc: add service field to new upcall
        rpc: add target field to new upcall
        nfsd: support callbacks with gss flavors
        rpc: allow gss callbacks to client
        rpc: pass target name down to rpc level on callbacks
        nfsd: pass client principal name in rsc downcall
        rpc: implement new upcall
        rpc: store pointer to pipe inode in gss upcall message
        rpc: use count of pipe openers to wait for first open
        rpc: track number of users of the gss upcall pipe
        rpc: call release_pipe only on last close
        rpc: add an rpc_pipe_open method
        rpc: minor gss_alloc_msg cleanup
        rpc: factor out warning code from gss_pipe_destroy_msg
        rpc: remove unnecessary assignment
        NFS: remove unused status from encode routines
        NFS: increment number of operations in each encode routine
        NFS: fix comment placement in nfs4xdr.c
        NFS: fix tabs in nfs4xdr.c
        ...
      f57fa1d6
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 6094c85a
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/mlx4: Fix reading SL field out of cqe->sl_vid
        RDMA/addr: Fix build breakage when IPv6 is disabled
      6094c85a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 590cf285
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (104 commits)
        [SCSI] fcoe: fix configuration problems
        [SCSI] cxgb3i: fix select/depend problem
        [SCSI] fcoe: fix incorrect use of struct module
        [SCSI] cxgb3i: remove use of skb->sp
        [SCSI] cxgb3i: Add cxgb3i iSCSI driver.
        [SCSI] zfcp: Remove unnecessary warning message
        [SCSI] zfcp: Add support for unchained FSF requests
        [SCSI] zfcp: Remove busid macro
        [SCSI] zfcp: remove DID_DID flag
        [SCSI] zfcp: Simplify mask lookups for incoming RSCNs
        [SCSI] zfcp: Remove initial device data from zfcp_data
        [SCSI] zfcp: fix compile warning
        [SCSI] zfcp: Remove adapter list
        [SCSI] zfcp: Simplify SBAL allocation to fix sparse warnings
        [SCSI] zfcp: register with SCSI layer on ccw registration
        [SCSI] zfcp: Fix message line break
        [SCSI] qla2xxx: changes in multiq code
        [SCSI] eata: fix the data buffer accessors conversion regression
        [SCSI] ibmvfc: Improve async event handling
        [SCSI] lpfc : correct printk types on PPC compiles
        ...
      590cf285
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · f54a6ec0
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (583 commits)
        V4L/DVB (10130): use USB API functions rather than constants
        V4L/DVB (10129): dvb: remove deprecated use of RW_LOCK_UNLOCKED in frontends
        V4L/DVB (10128): modify V4L documentation to be a valid XHTML
        V4L/DVB (10127): stv06xx: Avoid having y unitialized
        V4L/DVB (10125): em28xx: Don't do AC97 vendor detection for i2s audio devices
        V4L/DVB (10124): em28xx: expand output formats available
        V4L/DVB (10123): em28xx: fix reversed definitions of I2S audio modes
        V4L/DVB (10122): em28xx: don't load em28xx-alsa for em2870 based devices
        V4L/DVB (10121): em28xx: remove worthless Pinnacle PCTV HD Mini 80e device profile
        V4L/DVB (10120): em28xx: remove redundant Pinnacle Dazzle DVC 100 profile
        V4L/DVB (10119): em28xx: fix corrupted XCLK value
        V4L/DVB (10118): zoran: fix warning for a variable not used
        V4L/DVB (10116): af9013: Fix gcc false warnings
        V4L/DVB (10111a): usbvideo.h: remove an useless blank line
        V4L/DVB (10111): quickcam_messenger.c: fix a warning
        V4L/DVB (10110): v4l2-ioctl: Fix warnings when using .unlocked_ioctl = __video_ioctl2
        V4L/DVB (10109): anysee: Fix usage of an unitialized function
        V4L/DVB (10104): uvcvideo: Add support for video output devices
        V4L/DVB (10102): uvcvideo: Ignore interrupt endpoint for built-in iSight webcams.
        V4L/DVB (10101): uvcvideo: Fix bulk URB processing when the header is erroneous
        ...
      f54a6ec0
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 5ed18368
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        net: Fix percpu counters deadlock
        cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits: net
        drivers/net/usb: use USB API functions rather than constants
        cls_cgroup: clean up Kconfig
        cls_cgroup: clean up for cgroup part
        cls_cgroup: fix an oops when removing a cgroup
        EtherExpress16: fix printing timed out status
        mlx4_en: Added "set_ringparam" Ethtool interface implementation
        mlx4_en: Always allocate RX ring for each interrupt vector
        mlx4_en: Verify number of RX rings doesn't exceed MAX_RX_RINGS
        IPVS: Make "no destination available" message more consistent between schedulers
        net: KS8695: removed duplicated #include
        tun: Fix SIOCSIFHWADDR error.
        smsc911x: compile fix re netif_rx signature changes
        netns: foreach_netdev_safe is insufficient in default_device_exit
        net: make xfrm_statistics_seq_show use generic snmp_fold_field
        net: Fix more NAPI interface netdev argument drop fallout.
        net: Fix unused variable warnings in pasemi_mac.c and spider_net.c
      5ed18368
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · ab70537c
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        lguest: struct device - replace bus_id with dev_name()
        lguest: move the initial guest page table creation code to the host
        kvm-s390: implement config_changed for virtio on s390
        virtio_console: support console resizing
        virtio: add PCI device release() function
        virtio_blk: fix type warning
        virtio: block: dynamic maximum segments
        virtio: set max_segment_size and max_sectors to infinite.
        virtio: avoid implicit use of Linux page size in balloon interface
        virtio: hand virtio ring alignment as argument to vring_new_virtqueue
        virtio: use KVM_S390_VIRTIO_RING_ALIGN instead of relying on pagesize
        virtio: use LGUEST_VRING_ALIGN instead of relying on pagesize
        virtio: Don't use PAGE_SIZE for vring alignment in virtio_pci.
        virtio: rename 'pagesize' arg to vring_init/vring_size
        virtio: Don't use PAGE_SIZE in virtio_pci.c
        virtio: struct device - replace bus_id with dev_name(), dev_set_name()
        virtio-pci queue allocation not page-aligned
      ab70537c
    • L
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 14a3c4ab
      Linus Torvalds 提交于
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (407 commits)
        [ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices
        [ARM] pxafb: cleanup of the timing checking code
        [ARM] pxafb: cleanup of the color format manipulation code
        [ARM] pxafb: add palette format support for LCCR4_PAL_FOR_3
        [ARM] pxafb: add support for FBIOPAN_DISPLAY by dma braching
        [ARM] pxafb: allow pxafb_set_par() to start from arbitrary yoffset
        [ARM] pxafb: allow video memory size to be configurable
        [ARM] pxa: add document on the MFP design and how to use it
        [ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant
        [ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant
        [ARM] pxa/tavorevb: update board support (smartpanel LCD + keypad)
        [ARM] pxa: Update eseries defconfig
        [ARM] 5352/1: add w90p910-plat config file
        [ARM] s3c: S3C options should depend on PLAT_S3C
        [ARM] mv78xx0: implement GPIO and GPIO interrupt support
        [ARM] Kirkwood: implement GPIO and GPIO interrupt support
        [ARM] Orion: share GPIO IRQ handling code
        [ARM] Orion: share GPIO handling code
        [ARM] s3c: define __io using the typesafe version
        [ARM] S3C64XX: Ensure CPU_V6 is selected
        ...
      14a3c4ab
    • H
      tracing: removed duplicated #include · 1af237a0
      Huang Weiyi 提交于
      Removed duplicated #include in kernel/trace/trace.c.
      Signed-off-by: NHuang Weiyi <weiyi.huang@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1af237a0
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · 74a6d0f0
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (33 commits)
        ide-cd: remove dead dsc_overlap setting
        ide: push local_irq_{save,restore}() to do_identify()
        ide: remove superfluous local_irq_{save,restore}() from ide_dump_status()
        ide: move legacy ISA/VLB ports handling to ide-legacy.c (v2)
        ide: move Power Management support to ide-pm.c
        ide: use ATA_DMA_* defines in ide-dma-sff.c
        ide: checkpatch.pl fixes for ide-lib.c
        ide: remove inline tags from ide-probe.c
        ide: remove redundant code from ide_end_drive_cmd()
        ide: struct device - replace bus_id with dev_name(), dev_set_name()
        ide: rework handling of serialized ports (v2)
        cy82c693: remove superfluous ide_cy82c693 chipset type
        trm290: add IDE_HFLAG_TRM290 host flag
        ide: add ->max_sectors field to struct ide_port_info
        rz1000: apply chipset quirks early (v2)
        ide: always set nIEN on idle devices
        ide: fix ->quirk_list checking in ide_do_request()
        gayle: set IDE_HFLAG_SERIALIZE explictly
        cmd64x: set IDE_HFLAG_SERIALIZE explictly for CMD646
        ali14xx: doesn't use shared IRQs
        ...
      74a6d0f0
    • L
      14eeee88
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 5b8f2587
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        sata_sil: add Large Block Transfer support
        [libata] ata_piix: cleanup dmi strings checking
        DMI: add dmi_match
        libata: blacklist NCQ on OCZ CORE 2 SSD (resend)
        [libata] Update kernel-doc comments to match source code
        libata: perform port detach in EH
        libata: when restoring SControl during detach do the PMP links first
        libata: beef up iterators
      5b8f2587
    • L
      Merge branch 'oprofile-for-linus' of... · 526ea064
      Linus Torvalds 提交于
      Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        oprofile: select RING_BUFFER
        ring_buffer: adding EXPORT_SYMBOLs
        oprofile: fix lost sample counter
        oprofile: remove nr_available_slots()
        oprofile: port to the new ring_buffer
        ring_buffer: add remaining cpu functions to ring_buffer.h
        oprofile: moving cpu_buffer_reset() to cpu_buffer.h
        oprofile: adding cpu_buffer_entries()
        oprofile: adding cpu_buffer_write_commit()
        oprofile: adding cpu buffer r/w access functions
        ftrace: remove unused function arg in trace_iterator_increment()
        ring_buffer: update description for ring_buffer_alloc()
        oprofile: set values to default when creating oprofilefs
        oprofile: implement switch/case in buffer_sync.c
        x86/oprofile: cleanup IBS init/exit functions in op_model_amd.c
        x86/oprofile: reordering IBS code in op_model_amd.c
        oprofile: fix typo
        oprofile: whitspace changes only
        oprofile: update comment for oprofile_add_sample()
        oprofile: comment cleanup
      526ea064
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · db5e53fb
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        slub: avoid leaking caches or refcounts on sysfs error
        slab: Fix comment on #endif
        slab: remove GFP_THISNODE clearing from alloc_slabmgmt()
        slub: Add might_sleep_if() to slab_alloc()
        SLUB: failslab support
        slub: Fix incorrect use of loose
        slab: Update the kmem_cache_create documentation regarding the name parameter
        slub: make early_kmem_cache_node_alloc void
        slab: unsigned slabp->inuse cannot be less than 0
        slub - fix get_object_page comment
        SLUB: Replace __builtin_return_address(0) with _RET_IP_.
        SLUB: cleanup - define macros instead of hardcoded numbers
      db5e53fb
    • L
      Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 3f4b5c5d
      Linus Torvalds 提交于
      * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (37 commits)
        drm/i915: fix modeset devname allocation + agp init return check.
        drm/i915: Remove redundant test in error path.
        drm: Add a debug node for vblank state.
        drm: Avoid use-before-null-test on dev in drm_cleanup().
        drm/i915: Don't print to dmesg when taking signal during object_pin.
        drm: pin new and unpin old buffer when setting a mode.
        drm/i915: un-EXPORT and make 'intelfb_panic' static
        drm/i915: Delete unused, pointless i915_driver_firstopen.
        drm/i915: fix sparse warnings: returning void-valued expression
        drm/i915: fix sparse warnings: move 'extern' decls to header file
        drm/i915: fix sparse warnings: make symbols static
        drm/i915: fix sparse warnings: declare one-bit bitfield as unsigned
        drm/i915: Don't double-unpin buffers if we take a signal in evict_everything().
        drm/i915: Fix fbcon setup to align display pitch to 64b.
        drm/i915: Add missing userland definitions for gem init/execbuffer.
        i915/drm: provide compat defines for userspace for certain struct members.
        drm: drop DRM_IOCTL_MODE_REPLACEFB, add+remove works just as well.
        drm: sanitise drm modesetting API + remove unused hotplug
        drm: fix allowing master ioctls on non-master fds.
        drm/radeon: use locked rmmap to remove sarea mapping.
        ...
      3f4b5c5d
    • L
      Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6 · a4ba2e9e
      Linus Torvalds 提交于
      * 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
        agp/intel: Fix broken ® symbol in device name.
        agp/intel: add support for G41 chipset
      a4ba2e9e
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 · 6de71484
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (98 commits)
        sparc: move select of ARCH_SUPPORTS_MSI
        sparc: drop SUN_IO
        sparc: unify sections.h
        sparc: use .data.init_task section for init_thread_union
        sparc: fix array overrun check in of_device_64.c
        sparc: unify module.c
        sparc64: prepare module_64.c for unification
        sparc64: use bit neutral Elf symbols
        sparc: unify module.h
        sparc: introduce CONFIG_BITS
        sparc: fix hardirq.h removal fallout
        sparc64: do not export pus_fs_struct
        sparc: use sparc64 version of scatterlist.h
        sparc: Commonize memcmp assembler.
        sparc: Unify strlen assembler.
        sparc: Add asm/asm.h
        sparc: Kill memcmp_32.S code which has been ifdef'd out for centuries.
        sparc: replace for_each_cpu_mask_nr with for_each_cpu
        sparc: fix sparse warnings in irq_32.c
        sparc: add include guards to kernel.h
        ...
      6de71484