1. 09 8月, 2010 30 次提交
  2. 08 8月, 2010 10 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 2d530569
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (82 commits)
        firewire: core: add forgotten dummy driver methods, remove unused ones
        firewire: add isochronous multichannel reception
        firewire: core: small clarifications in core-cdev
        firewire: core: remove unused code
        firewire: ohci: release channel in error path
        firewire: ohci: use memory barriers to order descriptor updates
        tools/firewire: nosy-dump: increment program version
        tools/firewire: nosy-dump: remove unused code
        tools/firewire: nosy-dump: use linux/firewire-constants.h
        tools/firewire: nosy-dump: break up a deeply nested function
        tools/firewire: nosy-dump: make some symbols static or const
        tools/firewire: nosy-dump: change to kernel coding style
        tools/firewire: nosy-dump: work around segfault in decode_fcp
        tools/firewire: nosy-dump: fix it on x86-64
        tools/firewire: add userspace front-end of nosy
        firewire: nosy: note ioctls in ioctl-number.txt
        firewire: nosy: use generic printk macros
        firewire: nosy: endianess fixes and annotations
        firewire: nosy: annotate __user pointers and __iomem pointers
        firewire: nosy: fix device shutdown with active client
        ...
      2d530569
    • L
      Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 9e50ab91
      Linus Torvalds 提交于
      * 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (27 commits)
        ACPI / ACPICA: Simplify acpi_ev_initialize_gpe_block()
        ACPI / ACPICA: Fail acpi_gpe_wakeup() if ACPI_GPE_CAN_WAKE is unset
        ACPI / ACPICA: Do not execute _PRW methods during initialization
        ACPI: Fix bogus GPE test in acpi_bus_set_run_wake_flags()
        ACPICA: Update version to 20100702
        ACPICA: Fix for Alias references within Package objects
        ACPICA: Fix lint warning for 64-bit constant
        ACPICA: Remove obsolete GPE function
        ACPICA: Update debug output components
        ACPICA: Add support for WDDT - Watchdog Descriptor Table
        ACPICA: Drop acpi_set_gpe
        ACPICA: Use low-level GPE enable during GPE block initialization
        ACPI / EC: Do not use acpi_set_gpe
        ACPI / EC: Drop suspend and resume routines
        ACPICA: Remove wakeup GPE reference counting which is not used
        ACPICA: Introduce acpi_gpe_wakeup()
        ACPICA: Rename acpi_hw_gpe_register_bit
        ACPICA: Update version to 20100528
        ACPICA: Add signatures for undefined tables: ATKG, GSCI, IEIT
        ACPICA: Optimization: Reduce the number of namespace walks
        ...
      9e50ab91
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 3cc08fc3
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (42 commits)
        IB/qib: Add missing <linux/slab.h> include
        IB/ehca: Drop unnecessary NULL test
        RDMA/nes: Fix confusing if statement indentation
        IB/ehca: Init irq tasklet before irq can happen
        RDMA/nes: Fix misindented code
        RDMA/nes: Fix showing wqm_quanta
        RDMA/nes: Get rid of "set but not used" variables
        RDMA/nes: Read firmware version from correct place
        IB/srp: Export req_lim via sysfs
        IB/srp: Make receive buffer handling more robust
        IB/srp: Use print_hex_dump()
        IB: Rename RAW_ETY to RAW_ETHERTYPE
        RDMA/nes: Fix two sparse warnings
        RDMA/cxgb3: Make needlessly global iwch_l2t_send() static
        IB/iser: Make needlessly global iser_alloc_rx_descriptors() static
        RDMA/cxgb4: Add timeouts when waiting for FW responses
        IB/qib: Fix race between qib_error_qp() and receive packet processing
        IB/qib: Limit the number of packets processed per interrupt
        IB/qib: Allow writes to the diag_counters to be able to clear them
        IB/qib: Set cfgctxts to number of CPUs by default
        ...
      3cc08fc3
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · faa38b5e
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (214 commits)
        ALSA: hda - Add pin-fix for HP dc5750
        ALSA: als4000: Fix potentially invalid DMA mode setup
        ALSA: als4000: enable burst mode
        ALSA: hda - Fix initial capsrc selection in patch_alc269()
        ASoC: TWL4030: Capture route runtime DAPM ordering fix
        ALSA: hda - Add PC-beep whitelist for an Intel board
        ALSA: hda - More relax for pending period handling
        ALSA: hda - Define AC_FMT_* constants
        ALSA: hda - Fix beep frequency on IDT 92HD73xx and 92HD71Bxx codecs
        ALSA: hda - Add support for HDMI HBR passthrough
        ALSA: hda - Set Stream Type in Stream Format according to AES0
        ALSA: hda - Fix Thinkpad X300 so SPDIF is not exposed
        ALSA: hda - FIX to not expose SPDIF on Thinkpad X301, since it does not have the ability to use SPDIF
        ASoC: wm9081: fix resource reclaim in wm9081_register error path
        ASoC: wm8978: fix a memory leak if a wm8978_register fail
        ASoC: wm8974: fix a memory leak if another WM8974 is registered
        ASoC: wm8961: fix resource reclaim in wm8961_register error path
        ASoC: wm8955: fix resource reclaim in wm8955_register error path
        ASoC: wm8940: fix a memory leak if wm8940_register return error
        ASoC: wm8904: fix resource reclaim in wm8904_register error path
        ...
      faa38b5e
    • L
      Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing · 78417334
      Linus Torvalds 提交于
      * 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
        do_coredump: Do not take BKL
        init: Remove the BKL from startup code
      78417334
    • L
    • L
      Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux · 0d9f9e12
      Linus Torvalds 提交于
      * 'for-2.6.36' of git://linux-nfs.org/~bfields/linux: (34 commits)
        nfsd4: fix file open accounting for RDWR opens
        nfsd: don't allow setting maxblksize after svc created
        nfsd: initialize nfsd versions before creating svc
        net: sunrpc: removed duplicated #include
        nfsd41: Fix a crash when a callback is retried
        nfsd: fix startup/shutdown order bug
        nfsd: minor nfsd read api cleanup
        gcc-4.6: nfsd: fix initialized but not read warnings
        nfsd4: share file descriptors between stateid's
        nfsd4: fix openmode checking on IO using lock stateid
        nfsd4: miscellaneous process_open2 cleanup
        nfsd4: don't pretend to support write delegations
        nfsd: bypass readahead cache when have struct file
        nfsd: minor nfsd_svc() cleanup
        nfsd: move more into nfsd_startup()
        nfsd: just keep single lockd reference for nfsd
        nfsd: clean up nfsd_create_serv error handling
        nfsd: fix error handling in __write_ports_addxprt
        nfsd: fix error handling when starting nfsd with rpcbind down
        nfsd4: fix v4 state shutdown error paths
        ...
      0d9f9e12
    • D
      AFS: Fix the module init error handling · df44f9f4
      David Howells 提交于
      Fix the module init error handling.  There are a bunch of goto labels for
      aborting the init procedure at different points and just undoing what needs
      undoing - they aren't all in the right places, however.
      
      This can lead to an oops like the following:
      
      	BUG: unable to handle kernel NULL pointer dereference at 0000000000000020
      	IP: [<ffffffff81042a31>] destroy_workqueue+0x17/0xc0
      	...
      	Modules linked in: kafs(+) dns_resolver rxkad af_rxrpc fscache
      
      	Pid: 2171, comm: insmod Not tainted 2.6.35-cachefs+ #319 DG965RY/
      	...
      	Process insmod (pid: 2171, threadinfo ffff88003ca6a000, task ffff88003dcc3050)
      	...
      	Call Trace:
      	 [<ffffffffa0055994>] afs_callback_update_kill+0x10/0x12 [kafs]
      	 [<ffffffffa007d1c5>] afs_init+0x190/0x1ce [kafs]
      	 [<ffffffffa007d035>] ? afs_init+0x0/0x1ce [kafs]
      	 [<ffffffff810001ef>] do_one_initcall+0x59/0x14e
      	 [<ffffffff8105f7ee>] sys_init_module+0x9c/0x1de
      	 [<ffffffff81001eab>] system_call_fastpath+0x16/0x1b
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      df44f9f4
    • L
      Merge branch 'nfs-for-2.6.36' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 5df6b8e6
      Linus Torvalds 提交于
      * 'nfs-for-2.6.36' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (42 commits)
        NFS: NFSv4.1 is no longer a "developer only" feature
        NFS: NFS_V4 is no longer an EXPERIMENTAL feature
        NFS: Fix /proc/mount for legacy binary interface
        NFS: Fix the locking in nfs4_callback_getattr
        SUNRPC: Defer deleting the security context until gss_do_free_ctx()
        SUNRPC: prevent task_cleanup running on freed xprt
        SUNRPC: Reduce asynchronous RPC task stack usage
        SUNRPC: Move the bound cred to struct rpc_rqst
        SUNRPC: Clean up of rpc_bindcred()
        SUNRPC: Move remaining RPC client related task initialisation into clnt.c
        SUNRPC: Ensure that rpc_exit() always wakes up a sleeping task
        SUNRPC: Make the credential cache hashtable size configurable
        SUNRPC: Store the hashtable size in struct rpc_cred_cache
        NFS: Ensure the AUTH_UNIX credcache is allocated dynamically
        NFS: Fix the NFS users of rpc_restart_call()
        SUNRPC: The function rpc_restart_call() should return success/failure
        NFSv4: Get rid of the bogus RPC_ASSASSINATED(task) checks
        NFSv4: Clean up the process of renewing the NFSv4 lease
        NFSv4.1: Handle NFS4ERR_DELAY on SEQUENCE correctly
        NFS: nfs_rename() should not have to flush out writebacks
        ...
      5df6b8e6
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · fe21ea18
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: add retrieve request
        fuse: add store request
        fuse: don't use atomic kmap
      fe21ea18