1. 22 5月, 2010 17 次提交
  2. 21 5月, 2010 23 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · d7dbf4ff
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: (23 commits)
        nilfs2: disallow remount of snapshot from/to a regular mount
        nilfs2: use huge_encode_dev/huge_decode_dev
        nilfs2: update comment on deactivate_super at nilfs_get_sb
        nilfs2: replace MS_VERBOSE with MS_SILENT
        nilfs2: add missing initialization of s_mode
        nilfs2: fix misuse of open_bdev_exclusive/close_bdev_exclusive
        nilfs2: enlarge s_volume_name member in nilfs_super_block
        nilfs2: use checkpoint number instead of timestamp to select super block
        nilfs2: add missing endian conversion on super block magic number
        nilfs2: make nilfs_sc_*_ops static
        nilfs2: add kernel doc comments to persistent object allocator functions
        nilfs2: change sc_timer from a pointer to an embedded one in struct nilfs_sc_info
        nilfs2: remove nilfs_segctor_init() in segment.c
        nilfs2: insert checkpoint number in segment summary header
        nilfs2: add a print message after loading nilfs2
        nilfs2: cleanup multi kmem_cache_{create,destroy} code
        nilfs2: move out checksum routines to segment buffer code
        nilfs2: move pointer to super root block into logs
        nilfs2: change default of 'errors' mount option to 'remount-ro' mode
        nilfs2: Combine nilfs_btree_release_path() and nilfs_btree_free_path()
        ...
      d7dbf4ff
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 677abe49
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
        GFS2: Fix typo
        GFS2: stuck in inode wait, no glocks stuck
        GFS2: Eliminate useless err variable
        GFS2: Fix writing to non-page aligned gfs2_quota structures
        GFS2: Add some useful messages
        GFS2: fix quota state reporting
        GFS2: Various gfs2_logd improvements
        GFS2: glock livelock
        GFS2: Clean up stuffed file copying
        GFS2: docs update
        GFS2: Remove space from slab cache name
      677abe49
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · e90e4d92
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: fix ast ordering for user locks
        dlm: cleanup remove unused code
      e90e4d92
    • L
      Merge git://git.infradead.org/mtd-2.6 · 05ec7dd8
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6: (154 commits)
        mtd: cfi_cmdset_0002: use AMD standard command-set with Winbond flash chips
        mtd: cfi_cmdset_0002: Fix MODULE_ALIAS and linkage for new 0701 commandset ID
        mtd: mxc_nand: Remove duplicate NAND_CMD_RESET case value
        mtd: update gfp/slab.h includes
        jffs2: Stop triggering block erases from jffs2_write_super()
        jffs2: Rename jffs2_erase_pending_trigger() to jffs2_dirty_trigger()
        jffs2: Use jffs2_garbage_collect_trigger() to trigger pending erases
        jffs2: Require jffs2_garbage_collect_trigger() to be called with lock held
        jffs2: Wake GC thread when there are blocks to be erased
        jffs2: Erase pending blocks in GC pass, avoid invalid -EIO return
        jffs2: Add 'work_done' return value from jffs2_erase_pending_blocks()
        mtd: mtdchar: Do not corrupt backing device of device node inode
        mtd/maps/pcmciamtd: Fix printk format for ssize_t in debug messages
        drivers/mtd: Use kmemdup
        mtd: cfi_cmdset_0002: Fix argument order in bootloc warning
        mtd: nand: add Toshiba TC58NVG0 device ID
        pcmciamtd: add another ID
        pcmciamtd: coding style cleanups
        pcmciamtd: fixing obvious errors
        mtd: chips: add SST39WF160x NOR-flashes
        ...
      
      Trivial conflicts due to dev_node removal in drivers/mtd/maps/pcmciamtd.c
      05ec7dd8
    • L
      Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 · c316ba3b
      Linus Torvalds 提交于
      * 'linux-next' of git://git.infradead.org/ubi-2.6:
        UBI: misc comment fixes
        UBI: fix s/then/than/ typos
        UBI: init even if MTD device cannot be attached, if built into kernel
        UBI: remove reboot notifier
      c316ba3b
    • L
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · 777cb1b5
      Linus Torvalds 提交于
      * 'linux-next' of git://git.infradead.org/ubifs-2.6:
        UBIFS: mark VFS SB RO too
      777cb1b5
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 277a4ed1
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs: (54 commits)
        xfs: mark xfs_iomap_write_ helpers static
        xfs: clean up end index calculation in xfs_page_state_convert
        xfs: clean up mapping size calculation in __xfs_get_blocks
        xfs: clean up xfs_iomap_valid
        xfs: move I/O type flags into xfs_aops.c
        xfs: kill struct xfs_iomap
        xfs: report iomap_bn in block base
        xfs: report iomap_offset and iomap_bsize in block base
        xfs: remove iomap_delta
        xfs: remove iomap_target
        xfs: limit xfs_imap_to_bmap to a single mapping
        xfs: simplify buffer to transaction matching
        xfs: Make fiemap work in query mode.
        xfs: kill off l_sectbb_mask
        xfs: record log sector size rather than log2(that)
        xfs: remove dead XFS_LOUD_RECOVERY code
        xfs: removed unused XFS_QMOPT_ flags
        xfs: remove a few macro indirections in the quota code
        xfs: access quotainfo structure directly
        xfs: wait for direct I/O to complete in fsync and write_inode
        ...
      277a4ed1
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · 03e62303
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (47 commits)
        ocfs2: Silence a gcc warning.
        ocfs2: Don't retry xattr set in case value extension fails.
        ocfs2:dlm: avoid dlm->ast_lock lockres->spinlock dependency break
        ocfs2: Reset xattr value size after xa_cleanup_value_truncate().
        fs/ocfs2/dlm: Use kstrdup
        fs/ocfs2/dlm: Drop memory allocation cast
        Ocfs2: Optimize punching-hole code.
        Ocfs2: Make ocfs2_find_cpos_for_left_leaf() public.
        Ocfs2: Fix hole punching to correctly do CoW during cluster zeroing.
        Ocfs2: Optimize ocfs2 truncate to use ocfs2_remove_btree_range() instead.
        ocfs2: Block signals for mkdir/link/symlink/O_CREAT.
        ocfs2: Wrap signal blocking in void functions.
        ocfs2/dlm: Increase o2dlm lockres hash size
        ocfs2: Make ocfs2_extend_trans() really extend.
        ocfs2/trivial: Code cleanup for allocation reservation.
        ocfs2: make ocfs2_adjust_resv_from_alloc simple.
        ocfs2: Make nointr a default mount option
        ocfs2/dlm: Make o2dlm domain join/leave messages KERN_NOTICE
        o2net: log socket state changes
        ocfs2: print node # when tcp fails
        ...
      03e62303
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 33cf23b0
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (182 commits)
        [SCSI] aacraid: add an ifdef'd device delete case instead of taking the device offline
        [SCSI] aacraid: prohibit access to array container space
        [SCSI] aacraid: add support for handling ATA pass-through commands.
        [SCSI] aacraid: expose physical devices for models with newer firmware
        [SCSI] aacraid: respond automatically to volumes added by config tool
        [SCSI] fcoe: fix fcoe module ref counting
        [SCSI] libfcoe: FIP Keep-Alive messages for VPorts are sent with incorrect port_id and wwn
        [SCSI] libfcoe: Fix incorrect MAC address clearing
        [SCSI] fcoe: fix a circular locking issue with rtnl and sysfs mutex
        [SCSI] libfc: Move the port_id into lport
        [SCSI] fcoe: move link speed checking into its own routine
        [SCSI] libfc: Remove extra pointer check
        [SCSI] libfc: Remove unused fc_get_host_port_type
        [SCSI] fcoe: fixes wrong error exit in fcoe_create
        [SCSI] libfc: set seq_id for incoming sequence
        [SCSI] qla2xxx: Updates to ISP82xx support.
        [SCSI] qla2xxx: Optionally disable target reset.
        [SCSI] qla2xxx: ensure flash operation and host reset via sg_reset are mutually exclusive
        [SCSI] qla2xxx: Silence bogus warning by gcc for wrap and did.
        [SCSI] qla2xxx: T10 DIF support added.
        ...
      33cf23b0
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 7a9b1492
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
        USB: remove unused usb_buffer_alloc and usb_buffer_free macros
        usb: musb: update gfp/slab.h includes
        USB: ftdi_sio: fix legacy SIO-device header
        USB: kl5usb105: reimplement using generic framework
        USB: kl5usb105: minor clean ups
        USB: kl5usb105: fix memory leak
        USB: io_ti: use kfifo to implement write buffering
        USB: io_ti: remove unsused private counter
        USB: ti_usb: use kfifo to implement write buffering
        USB: ir-usb: fix incorrect write-buffer length
        USB: aircable: fix incorrect write-buffer length
        USB: safe_serial: straighten out read processing
        USB: safe_serial: reimplement read using generic framework
        USB: safe_serial: reimplement write using generic framework
        usb-storage: always print quirks
        USB: usb-storage: trivial debug improvements
        USB: oti6858: use port write fifo
        USB: oti6858: use kfifo to implement write buffering
        USB: cypress_m8: use kfifo to implement write buffering
        USB: cypress_m8: remove unused drain define
        ...
      
      Fix up conflicts (due to usb_buffer_alloc/free renaming) in
      	drivers/input/tablet/acecad.c
      	drivers/input/tablet/kbtab.c
      	drivers/input/tablet/wacom_sys.c
      	drivers/media/video/gspca/gspca.c
      	sound/usb/usbaudio.c
      7a9b1492
    • S
      sound: fixup for usb_buffer_alloc/free rename · 3d62e3fd
      Stephen Rothwell 提交于
      This is needed before the USB merge.
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3d62e3fd
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · f8965467
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
        qlcnic: adding co maintainer
        ixgbe: add support for active DA cables
        ixgbe: dcb, do not tag tc_prio_control frames
        ixgbe: fix ixgbe_tx_is_paused logic
        ixgbe: always enable vlan strip/insert when DCB is enabled
        ixgbe: remove some redundant code in setting FCoE FIP filter
        ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
        ixgbe: fix header len when unsplit packet overflows to data buffer
        ipv6: Never schedule DAD timer on dead address
        ipv6: Use POSTDAD state
        ipv6: Use state_lock to protect ifa state
        ipv6: Replace inet6_ifaddr->dead with state
        cxgb4: notify upper drivers if the device is already up when they load
        cxgb4: keep interrupts available when the ports are brought down
        cxgb4: fix initial addition of MAC address
        cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
        cnic: Convert cnic_local_flags to atomic ops.
        can: Fix SJA1000 command register writes on SMP systems
        bridge: fix build for CONFIG_SYSFS disabled
        ARCNET: Limit com20020 PCI ID matches for SOHARD cards
        ...
      
      Fix up various conflicts with pcmcia tree drivers/net/
      {pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
      wireless/orinoco/spectrum_cs.c} and feature removal
      (Documentation/feature-removal-schedule.txt).
      
      Also fix a non-content conflict due to pm_qos_requirement getting
      renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
      f8965467
    • L
      Merge branch 'docs-next' of git://git.lwn.net/linux-2.6 · a26272e5
      Linus Torvalds 提交于
      * 'docs-next' of git://git.lwn.net/linux-2.6:
        Add a document describing the padata interface
      a26272e5
    • L
      Merge branch 'viafb-next' of git://git.lwn.net/linux-2.6 · 7c6d87ac
      Linus Torvalds 提交于
      * 'viafb-next' of git://git.lwn.net/linux-2.6: (35 commits)
        viafb: move some include files to include/linux
        viafb: Eliminate some global.h references
        viafb: get rid of i2c debug cruft
        viafb: fold via_io.h into via-core.h
        viafb: Fix initialization error paths
        viafb: Do not remove gpiochip under spinlock
        viafb: make procfs entries optional
        viafb: fix proc entry removal
        viafb: improve misc register handling
        viafb: replace inb/outb
        viafb: move some modesetting functions to a seperate file
        viafb: unify modesetting functions
        viafb: Reserve framebuffer memory for the upcoming camera driver
        viafb: Add a simple VX855 DMA engine driver
        viafb: Add a simple interrupt management infrastructure
        via: Rationalize vt1636 detection
        viafb: Introduce viafb_find_i2c_adapter()
        via: Do not attempt I/O on inactive I2C adapters
        viafb: Turn GPIO and i2c into proper platform devices
        viafb: Convert GPIO and i2c to the new indexed port ops
        ...
      7c6d87ac
    • G
      USB: remove unused usb_buffer_alloc and usb_buffer_free macros · e26bcf37
      Greg Kroah-Hartman 提交于
      Now that all callers are converted over, remove the compatibility
      functions and all is good.
      
      Cc: Daniel Mack <daniel@caiaq.de>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      e26bcf37
    • T
      usb: musb: update gfp/slab.h includes · c4d80b7d
      Tejun Heo 提交于
      Implicit slab.h inclusion via percpu.h is about to go away.  Make sure
      gfp.h or slab.h is included as necessary.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      c4d80b7d
    • J
      USB: ftdi_sio: fix legacy SIO-device header · c1aa075a
      Johan Hovold 提交于
      Length field of header was incorrectly set to available payload space
      rather than the actual payload size.
      Signed-off-by: NJohan Hovold <jhovold@gmail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      c1aa075a
    • J
      USB: kl5usb105: reimplement using generic framework · 60b3013c
      Johan Hovold 提交于
      Kill custom read and write implementations (static per-port,
      singleton(!) urb pool).
      
      Also remove changelog header (can be retrieved through git).
      
      Read processing and write-buffer handling tested using a cp210x device
      in a loopback setup.
      Signed-off-by: NJohan Hovold <jhovold@gmail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      60b3013c
    • J
      USB: kl5usb105: minor clean ups · ff8c195f
      Johan Hovold 提交于
      Whitespace changes and some removed comments.
      Signed-off-by: NJohan Hovold <jhovold@gmail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      ff8c195f
    • J
      USB: kl5usb105: fix memory leak · 313b0d80
      Johan Hovold 提交于
      Private data was not freed on error path in startup.
      
      Cc: stable <stable@kernel.org>
      Signed-off-by: NJohan Hovold <jhovold@gmail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      313b0d80
    • J
      USB: io_ti: use kfifo to implement write buffering · d733cec1
      Johan Hovold 提交于
      Kill custom fifo implementation.
      
      Compile-only tested.
      Signed-off-by: NJohan Hovold <jhovold@gmail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      d733cec1
    • J
      USB: io_ti: remove unsused private counter · a3a30f10
      Johan Hovold 提交于
      Signed-off-by: NJohan Hovold <jhovold@gmail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      a3a30f10
    • J
      USB: ti_usb: use kfifo to implement write buffering · 074ef65a
      Johan Hovold 提交于
      Kill custom fifo implementation.
      
      Compile-only tested.
      Signed-off-by: NJohan Hovold <jhovold@gmail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      074ef65a