1. 09 5月, 2007 21 次提交
  2. 08 5月, 2007 19 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 5b94f675
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SCSI] esp_scsi: Fix section mismatch warnings.
        [VIDEO] sunxvr2500: Fix PCI device ID table.
      5b94f675
    • L
      Fix bluetooth HCI sysfs compile · d12db0b0
      Linus Torvalds 提交于
      More fallout from the removal of "struct subsystem" from the core device
      model.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d12db0b0
    • M
    • D
      [VIDEO] sunxvr2500: Fix PCI device ID table. · de9f0cf9
      David S. Miller 提交于
      Noticed by Meelis Roos.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      de9f0cf9
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · a989705c
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] update memory attribute aliasing documentation & test cases
        [IA64] fail mmaps that span areas with incompatible attributes
        [IA64] allow WB /sys/.../legacy_mem mmaps
        [IA64] make ioremap avoid unsupported attributes
        [IA64] rename ioremap variables to match i386
        [IA64] relax per-cpu TLB requirement to DTC
        [IA64] remove per-cpu ia64_phys_stacked_size_p8
        [IA64] Fix example error injection program
        [IA64] Itanium MC Error Injection Tool: pal_mc_error_inject() interface
        [IA64] Itanium MC Error Injection Tool: Makefile changes
        [IA64] Itanium MC Error Injection Tool: Driver sysfs interface
        [IA64] Itanium MC Error Injection Tool: Doc and sample application
        [IA64] Itanium MC Error Injection Tool: Kernel configuration
      a989705c
    • L
      Merge branch 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux · 2d56d3c4
      Linus Torvalds 提交于
      * 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux:
        gfs2: nfs lock support for gfs2
        lockd: add code to handle deferred lock requests
        lockd: always preallocate block in nlmsvc_lock()
        lockd: handle test_lock deferrals
        lockd: pass cookie in nlmsvc_testlock
        lockd: handle fl_grant callbacks
        lockd: save lock state on deferral
        locks: add fl_grant callback for asynchronous lock return
        nfsd4: Convert NFSv4 to new lock interface
        locks: add lock cancel command
        locks: allow {vfs,posix}_lock_file to return conflicting lock
        locks: factor out generic/filesystem switch from setlock code
        locks: factor out generic/filesystem switch from test_lock
        locks: give posix_test_lock same interface as ->lock
        locks: make ->lock release private data before returning in GETLK case
        locks: create posix-to-flock helper functions
        locks: trivial removal of unnecessary parentheses
      2d56d3c4
    • L
      Fix up SLUB compile · 0f9008ef
      Linus Torvalds 提交于
      The newly merged SLUB allocator patches had been generated before the
      removal of "struct subsystem", and ended up applying fine, but wouldn't
      build based on the current tree as a result.
      
      Fix up that merge error - not that SLUB is likely really ready for
      showtime yet, but at least I can fix the trivial stuff.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0f9008ef
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 5cefcab3
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (34 commits)
        [GFS2] Uncomment sprintf_symbol calling code
        [DLM] lowcomms style
        [GFS2] printk warning fixes
        [GFS2] Patch to fix mmap of stuffed files
        [GFS2] use lib/parser for parsing mount options
        [DLM] Lowcomms nodeid range & initialisation fixes
        [DLM] Fix dlm_lowcoms_stop hang
        [DLM] fix mode munging
        [GFS2] lockdump improvements
        [GFS2] Patch to detect corrupt number of dir entries in leaf and/or inode blocks
        [GFS2] bz 236008: Kernel gpf doing cat /debugfs/gfs2/xxx (lock dump)
        [DLM] fs/dlm/ast.c should #include "ast.h"
        [DLM] Consolidate transport protocols
        [DLM] Remove redundant assignment
        [GFS2] Fix bz 234168 (ignoring rgrp flags)
        [DLM] change lkid format
        [DLM] interface for purge (2/2)
        [DLM] add orphan purging code (1/2)
        [DLM] split create_message function
        [GFS2] Set drop_count to 0 (off) by default
        ...
      5cefcab3
    • L
      Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 · 5f757f91
      Linus Torvalds 提交于
      * 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm/i915: Add 965GM pci id update
        drm: just use io_remap_pfn_range on all archs..
        drm: fix DRM_CONSISTENT mapping
        drm: fix up mmap locking in preparation for ttm changes
        drm: fix driver deadlock with AIGLX and reclaim_buffers_locked
        drm: fix warning in drm_fops.c
        drm: allow for more generic drm ioctls
        drm: fix alpha domain handling
        via: fix CX700 pci id
        drm: make drm_io_prot static.
        drm: remove via_mm.h
        drm: add missing NULL assignment
        drm/radeon: Fix u32 overflows when determining AGP base address in card space.
        drm: port over use_vmalloc code from git hashtab
        drm: fix crash with fops lock and fixup sarea/page size locking
        drm: bring bufs code from git tree.
        drm: move protection stuff into separate function
        drm: Use ARRAY_SIZE macro when appropriate
        drm: update README.drm (bugzilla #7933)
        drm: remove unused exports
      5f757f91
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 9fa0853a
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [NET]: rfkill: add support for input key to control wireless radio
        [NET] net/core: Fix error handling
        [TG3]: Update version and reldate.
        [TG3]: Eliminate spurious interrupts.
        [TG3]: Add ASPM workaround.
        [Bluetooth] Correct SCO buffer for another Broadcom based dongle
        [Bluetooth] Add support for Targus ACB10US USB dongle
        [Bluetooth] Disconnect L2CAP connection after last RFCOMM DLC
        [Bluetooth] Check that device is in rfcomm_dev_list before deleting
        [Bluetooth] Use in-kernel sockets API
        [Bluetooth] Attach host adapters to the Bluetooth bus
        [Bluetooth] Fix L2CAP and HCI setsockopt() information leaks
      9fa0853a
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · ef93127e
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SERIAL] sunsu: Fix section mismatch warnings.
        [SPARC64]: pgtable_cache_init() should be __init.
        [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/prom.c
        [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/pci.c
        [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/console.c
        [MM]: sparse_init() should be __init.
        [SPARC64]: Update defconfig.
        [VIDEO]: Add Sun XVR-2500 framebuffer driver.
        [VIDEO]: Add Sun XVR-500 framebuffer driver.
        [SPARC64]: SUN4U PCI-E controller support.
        [SPARC]: Fix comment typo in smp4m_blackbox_current().
        [SCSI] SUNESP: sun_esp.c needs linux/delay.h
      
      Fix up conflict in arch/sparc64/mm/init.c manually due to removal of
      pgtable_cache_init() through the -mm patches (even though that patch was
      also by David ;)
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ef93127e
    • L
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · 972d45fb
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
        IPoIB: Convert to NAPI
        IB: Return "maybe missed event" hint from ib_req_notify_cq()
        IB: Add CQ comp_vector support
        IB/ipath: Fix a race condition when generating ACKs
        IB/ipath: Fix two more spin lock problems
        IB/fmr_pool: Add prefix to all printks
        IB/srp: Set proc_name
        IB/srp: Add orig_dgid sysfs attribute to scsi_host
        IPoIB/cm: Don't crash if remote side uses one QP for both directions
        RDMA/cxgb3: Support for new abort logic
        RDMA/cxgb3: Initialize cpu_idx field in cpl_close_listserv_req message
        RDMA/cxgb3: Fail qp creation if the requested max_inline is too large
        RDMA/cxgb3: Fix TERM codes
        IPoIB/cm: Fix error handling in ipoib_cm_dev_open()
        IB/ipath: Don't corrupt pending mmap list when unmapped objects are freed
        IB/mthca: Work around kernel QP starvation
        IB/ipath: Don't put QP in timeout queue if waiting to send
        IB/ipath: Don't call spin_lock_irq() from interrupt context
      972d45fb
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 · 5b6b5498
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (38 commits)
        sh: R7785RP board updates.
        sh: Update r7780rp defconfig.
        sh: Add die chain notifiers.
        sh: Fix APM emulation on hp6xx.
        sh: Wire up more IRQs for SH7709.
        sh: Solution Engine 7722 board support.
        sh: Fix r7780rp build.
        sh: kdump support.
        sh: Move clock reporting to its own proc entry.
        sh: Solution Engine SH7705 board and CPU updates.
        serial: sh-sci: Fix module clock refcount for serial console.
        serial: sh-sci: Fix module clock refcounting.
        sh: SH7722 clock framework support.
        sh: hp6xx pata_platform support.
        sh: Obey CONFIG_HZ for HZ definition.
        sh: Fix fstatat64() syscall.
        sh: se7780 PCI support.
        sh: SH7780 Solution Engine board support.
        sh: Add a dummy SH-4 PCIC fixup.
        sh: Tidy up L-BOX area5 addresses.
        ...
      5b6b5498
    • A
      spi_s3c24xx.c: Fix build · 35c74823
      Arnaud Patard 提交于
      Commit a836f585 removes the shutdown
      member of the bitbang structure, breaking the build of spi_s3c24xx.c.
      Signed-off-by: NArnaud Patard <arnaud.patard@rtp-net.org>
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      35c74823
    • Y
      rename TANBAC TB0219 config · 09762516
      Yoichi Yuasa 提交于
      Rename config for TANBAC TB0219 GPIO support to something more appropriate.
      
      Fixes this:
      
      drivers/char/Kconfig:906:warning: type of 'TANBAC_TB0219' redefined from 'boolean' to 'tristate'
      drivers/char/Kconfig:907:warning: choice values currently only support a single
      prompt
      Signed-off-by: NYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
      Acked-by: NRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      09762516
    • G
      ehci-ps3, ohci-ps3: fix compilation · 2fda4c90
      Geoff Levand 提交于
      As seen on powerpc-cell et al:
      
        CC [M]  drivers/usb/host/ehci-hcd.o
      In file included from drivers/usb/host/ehci-hcd.c:941:
      drivers/usb/host/ehci-ps3.c:79: error: conflicting types for 'dev_dbg'
      include/linux/device.h:576: error: previous definition of 'dev_dbg' was here
      make[4]: *** [drivers/usb/host/ehci-hcd.o] Error 1
        CC [M]  drivers/usb/host/ohci-hcd.o
      In file included from drivers/usb/host/ohci-hcd.c:921:
      drivers/usb/host/ohci-ps3.c:83: error: conflicting types for 'dev_dbg'
      include/linux/device.h:576: error: previous definition of 'dev_dbg' was here
      
      dev_dbg() will check format string for you in dummy case also, so remove
      buggers.
      Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Greg KH <greg@kroah.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Geoff Levand <geoffrey.levand@am.sony.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2fda4c90
    • R
      Fix ppp_deflate issues with recent zlib_inflate changes · f0ac6758
      Richard Purdie 提交于
      The last zlib_inflate update broke certain corner cases for ppp_deflate
      decompression handling.  This patch fixes some logic to make things work
      properly again.  Users other than ppp_deflate (the only Z_PACKET_FLUSH
      user) should be unaffected.
      
      Fixes bug 8405 (confirmed by Stefan)
      Signed-off-by: NRichard Purdie <rpurdie@rpsys.net>
      Cc: Stefan Wenk <stefan.wenk@gmx.at>
      Cc: <stable@kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f0ac6758
    • A
      cx88-video build fix · c24228da
      Andrew Morton 提交于
      alpha:
      
      drivers/media/video/cx88/cx88-video.c: In function 'cx8800_initdev':
      drivers/media/video/cx88/cx88-video.c:1782: error: 'DMA_32BIT_MASK' undeclared (first use in this function)
      drivers/media/video/cx88/cx88-video.c:1782: error: (Each undeclared identifier is reported only once
      drivers/media/video/cx88/cx88-video.c:1782: error: for each function it appears in.)
      
      Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c24228da
    • J
      xtensa: strlcpy is smart enough · 0ddb16cf
      Jean Delvare 提交于
      strlcpy already accounts for the trailing zero in its length
      computation, so there is no need to substract one to the buffer size.
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      Cc: Chris Zankel <chris@zankel.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0ddb16cf