1. 21 May, 2010 2 commits
    • Stephen Rothwell's avatar
      sound: fixup for usb_buffer_alloc/free rename · 3d62e3fd
      Stephen Rothwell authored
      This is needed before the USB merge.
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3d62e3fd
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · f8965467
      Linus Torvalds authored
      * 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
  2. 20 May, 2010 33 commits
    • Linus Torvalds's avatar
      Merge branch 'docs-next' of git://git.lwn.net/linux-2.6 · a26272e5
      Linus Torvalds authored
      * 'docs-next' of git://git.lwn.net/linux-2.6:
        Add a document describing the padata interface
      a26272e5
    • Linus Torvalds's avatar
      Merge branch 'viafb-next' of git://git.lwn.net/linux-2.6 · 7c6d87ac
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · a0fe3cc5
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
        Input: psmouse - small formatting changes to better follow coding style
        Input: synaptics - set dimensions as reported by firmware
        Input: elantech - relax signature checks
        Input: elantech - enforce common prefix on messages
        Input: wistron_btns - switch to using kmemdup()
        Input: usbtouchscreen - switch to using kmemdup()
        Input: do not force selecting i8042 on Moorestown
        Input: Documentation/sysrq.txt - update KEY_SYSRQ info
        Input: 88pm860x_onkey - remove invalid irq number assignment
        Input: i8042 - add a PNP entry to the aux device list
        Input: i8042 - add some extra PNP keyboard types
        Input: wm9712 - fix wm97xx_set_gpio() logic
        Input: add keypad driver for keys interfaced to TCA6416
        Input: remove obsolete {corgi,spitz,tosa}kbd.c
        Input: kbtab - do not advertise unsupported events
        Input: kbtab - simplify kbtab_disconnect()
        Input: kbtab - fix incorrect size parameter in usb_buffer_free
        Input: acecad - don't advertise mouse events
        Input: acecad - fix some formatting issues
        Input: acecad - simplify usb_acecad_disconnect()
        ...
      
      Trivial conflict in Documentation/feature-removal-schedule.txt
      a0fe3cc5
    • Linus Torvalds's avatar
      Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 04afb405
      Linus Torvalds authored
      * 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (22 commits)
        ACPI: fix early DSDT dmi check warnings on ia64
        ACPICA: Update version to 20100428.
        ACPICA: Update/clarify some parameter names associated with acpi_handle
        ACPICA: Rename acpi_ex_system_do_suspend->acpi_ex_system_do_sleep
        ACPICA: Prevent possible allocation overrun during object copy
        ACPICA: Split large file, evgpeblk
        ACPICA: Add GPE support for dynamically loaded ACPI tables
        ACPICA: Clarify/rename some root table descriptor fields
        ACPICA: Update version to 20100331.
        ACPICA: Minimize the differences between linux GPE code and ACPICA code base
        ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT
        ACPICA: Update DSDT copy/detection.
        ACPICA: Add subsystem option to force copy of DSDT to local memory
        ACPICA: Add detection of corrupted/replaced DSDT
        ACPICA: Add write support for DataTable operation regions
        ACPICA: Fix for acpi_reallocate_root_table for incorrect root table copy
        ACPICA: Update comments/headers, no functional change
        ACPICA: Update version to 20100304
        ACPICA: Fix for possible fault in acpi_ex_release_mutex
        ACPICA: Standardize integer output for ACPICA warnings/errors
        ...
      04afb405
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 7f06a8b2
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (250 commits)
        ALSA: hda: Storage class should be before const qualifier
        ASoC: tpa6130a2: Remove CPVSS and HPVdd supplies
        ASoC: tpa6130a2: Define output pins with SND_SOC_DAPM_OUTPUT
        ASoC: sdp4430 - add sdp4430 pcm ops to DAI.
        ASoC: TWL6040: Enable earphone path in codec
        ASoC: SDP4430: Add support for Earphone speaker
        ASoC: SDP4430: Add sdp4430 machine driver
        ASoC: tlv320dac33: Avoid powering off while in BIAS_OFF
        ASoC: tlv320dac33: Use dev_dbg in dac33_hard_power function
        ALSA: sound/pci/asihpi: Use kzalloc
        ALSA: hdmi - dont fail on extra nodes
        ALSA: intelhdmi - add id for the CougarPoint chipset
        ALSA: intelhdmi - user friendly codec name
        ALSA: intelhdmi - add dependency on SND_DYNAMIC_MINORS
        ALSA: asihpi: incorrect range check
        ALSA: asihpi: testing the wrong variable
        ALSA: es1688: add pedantic range checks
        ARM: McBSP: Add support for omap4 in McBSP driver
        ARM: McBSP: Fix request for irq in OMAP4
        OMAP: McBSP: Add 32-bit mode support
        ...
      7f06a8b2
    • Linus Torvalds's avatar
      Merge branch 'for-linus/i2c-2635' of git://git.fluff.org/bjdooks/linux · c3ad33c9
      Linus Torvalds authored
      * 'for-linus/i2c-2635' of git://git.fluff.org/bjdooks/linux: (21 commits)
        i2c-highlander: remover superflous variable
        i2c-ibm-iic: drop NO_IRQ
        i2c-cpm: drop NO_IRQ
        i2c-mpc: drop NO_IRQ
        MAINTAINERS: add i2c tree for embedded platforms
        i2c-pxa: only define 'blue_murder'-function if DEBUG is #defined
        i2c-pxa: remove unused macro
        i2c-nomadik: fix operator precedence warning
        i2c-nomadik: release region when removed
        OMAP3: I2C: Clean up Errata 1p153 handling
        OMAP2/3: I2C: Errata ID i207: Clear wrong RDR interrupt
        omap: i2c: add a timeout to the busy waiting
        omap: i2c: make errata 1.153 workaround a separate function
        i2c-omap: add mpu wake up latency constraint in i2c
        omap: i2c: Add i2c support on omap4 platform
        i2c-bfin-twi: return completion in interrupt for smbus quick transfers
        i2c-bfin-twi: remove redundant retry
        i2c-bfin-twi: fix lost interrupts at high speeds
        i2c-bfin-twi: add debug output for error status
        i2c-bfin-twi: integrate timeout timer with completion interface
        ...
      c3ad33c9
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · fb091be0
      Linus Torvalds authored
      * 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (534 commits)
        V4L/DVB (13554a): v4l: Use the video_drvdata function in drivers
        V4L/DVB: vivi and mem2mem_testdev need slab.h to build
        V4L/DVB: tm6000: bugfix image position
        V4L/DVB: IR/imon: remove dead IMON_KEY_RELEASE_OFFSET
        V4L/DVB: tm6000: README - add vbi
        V4L/DVB: Fix unlock logic at medusa_video_init
        V4L/DVB: fix dvb frontend lockup
        V4L/DVB: s2255drv: remove dead code
        V4L/DVB: s2255drv: return if vdev not found
        V4L/DVB: ov511: cleanup: remove unneeded null check
        V4L/DVB: media/mem2mem: dereferencing free memory
        V4L/DVB: media/IR: Add missing include file to rc-map.c
        V4L/DVB: dvb/stv6110x: cleanup error handling
        V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig
        V4L/DVB: ngene: start separating out DVB functions into separate file
        V4L/DVB: ngene: split out card specific code into a separate file
        V4L/DVB: ngene: split out i2c code into a separate file
        V4L/DVB: ngene: add initial support for digital side of Avermedia m780
        V4L/DVB: ngene: properly support boards where channel 0 isn't a TS input
        V4L-DVB: ngene: make sure that tuner headers are included
        ...
      fb091be0
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · bd7fc2f2
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (49 commits)
        libata-sff: separate out BMDMA qc_issue
        libata-sff: prd is BMDMA specific
        libata-sff: ata_sff_[dumb_]qc_prep are BMDMA specific
        libata-sff: separate out BMDMA EH
        libata-sff: port_task is SFF specific
        libata-sff: ap->[last_]ctl are SFF specific
        libata-sff: rename ap->ops->drain_fifo() to sff_drain_fifo()
        libata-sff: introduce ata_sff_init/exit() and ata_sff_port_init()
        libata-sff: clean up BMDMA initialization
        libata-sff: clean up inheritance in several drivers
        libata-sff: reorder SFF/BMDMA functions
        sata_inic162x: kill PORT_PRD_ADDR initialization
        libata: kill ATA_FLAG_DISABLED
        libata-sff: kill unused prototype and make ata_dev_select() static
        libata-sff: update bmdma host bus error handling
        sata_mv: remove unnecessary initialization
        sata_inic162x: inic162x is not dependent on CONFIG_ATA_SFF
        pata_sch: use ata_pci_sff_init_one()
        pata_sil680: Do our own exec_command posting
        libata: Remove excess delay in the tf_load path
        ...
      bd7fc2f2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · f39d01be
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
        vlynq: make whole Kconfig-menu dependant on architecture
        add descriptive comment for TIF_MEMDIE task flag declaration.
        EEPROM: max6875: Header file cleanup
        EEPROM: 93cx6: Header file cleanup
        EEPROM: Header file cleanup
        agp: use NULL instead of 0 when pointer is needed
        rtc-v3020: make bitfield unsigned
        PCI: make bitfield unsigned
        jbd2: use NULL instead of 0 when pointer is needed
        cciss: fix shadows sparse warning
        doc: inode uses a mutex instead of a semaphore.
        uml: i386: Avoid redefinition of NR_syscalls
        fix "seperate" typos in comments
        cocbalt_lcdfb: correct sections
        doc: Change urls for sparse
        Powerpc: wii: Fix typo in comment
        i2o: cleanup some exit paths
        Documentation/: it's -> its where appropriate
        UML: Fix compiler warning due to missing task_struct declaration
        UML: add kernel.h include to signal.c
        ...
      f39d01be
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · 54291263
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (29 commits)
        pcmcia: disable PCMCIA ioctl also for ARM
        drivers/staging/comedi: dev_node removal (quatech_daqp_cs)
        drivers/staging/comedi: dev_node removal (ni_mio_cs)
        drivers/staging/comedi: dev_node removal (ni_labpc_cs)
        drivers/staging/comedi: dev_node removal (ni_daq_dio24)
        drivers/staging/comedi: dev_node removal (ni_daq_700)
        drivers/staging/comedi: dev_node removal (das08_cs)
        drivers/staging/comedi: dev_node removal (cb_das16_cs)
        pata_pcmcia: get rid of extra indirection
        pcmcia: remove suspend-related comment from yenta_socket.c
        pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex held
        pcmcia: remove pcmcia_add_device_lock
        pcmcia: update gfp/slab.h includes
        pcmcia: remove unused mem_op.h
        pcmcia: do not autoadd root PCI bus resources
        pcmcia: clarify alloc_io_space, move it to resource handlers
        pcmcia: move all pcmcia_resource_ops providers into one module
        pcmcia: move high level CIS access code to separate file
        pcmcia: dev_node removal (core)
        pcmcia: dev_node removal (remaining drivers)
        ...
      54291263
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · 46ee9645
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
        PM: PM QOS update fix
        Freezer / cgroup freezer: Update stale locking comments
        PM / platform_bus: Allow runtime PM by default
        i2c: Fix bus-level power management callbacks
        PM QOS update
        PM / Hibernate: Fix block_io.c printk warning
        PM / Hibernate: Group swap ops
        PM / Hibernate: Move the first_sector out of swsusp_write
        PM / Hibernate: Separate block_io
        PM / Hibernate: Snapshot cleanup
        FS / libfs: Implement simple_write_to_buffer
        PM / Hibernate: document open(/dev/snapshot) side effects
        PM / Runtime: Add sysfs debug files
        PM: Improve device power management document
        PM: Update device power management document
        PM: Allow runtime_suspend methods to call pm_schedule_suspend()
        PM: pm_wakeup - switch to using bool
      46ee9645
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · fa5312d9
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: change cancel_work_sync() to clear work->data
        workqueue: warn about flush_scheduled_work()
      fa5312d9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · 9c688c11
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        ia64: add sparse annotation to __ia64_per_cpu_var()
        percpu: implement kernel memory based chunk allocation
        percpu: move vmalloc based chunk management into percpu-vm.c
        percpu: misc preparations for nommu support
        percpu: reorganize chunk creation and destruction
        percpu: factor out pcpu_addr_in_first/reserved_chunk() and update per_cpu_ptr_to_phys()
      9c688c11
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 9d35bc1e
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/core: Use kmemdup() instead of kmalloc()+memcpy()
        IB/iser: Fix error flow in iser_create_ib_conn_res()
        IB/iser: Enhance disconnection logic for multi-pathing
        IB/iser: Remove buggy back-pointer setting
        IB/iser: Add asynchronous event handler
        MAINTAINERS: Add cxgb4 and iw_cxgb4 entries
        RDMA/cxgb3: Shrink .text with compile-time init of handlers arrays
        IPoIB: Allow disabling/enabling TSO on the fly through ethtool
        IB/mlx4: Add support for masked atomic operations
        IB/core: Add support for masked atomic operations
        RDMA/cma: Randomize local port allocation
        RDMA/nes: Make unnecessarily global functions static
        RDMA/nes: Make nesadapter->phy_lock usage consistent
        RDMA/cxgb4: Add driver for Chelsio T4 RNIC
        IB/mthca: Use the dma state API instead of pci equivalents
        RDMA/amso1100: Use the dma state API instead of pci equivalents
        RDMA/cxgb3: Don't free skbs on NET_XMIT_* indications from LLD
        RDMA/cxgb3: Use the dma state API instead of pci equivalents
        IB: Explicitly rule out llseek to avoid BKL in default_llseek()
      9d35bc1e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of... · 96b5b7f4
      Linus Torvalds authored
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (61 commits)
        KEYS: Return more accurate error codes
        LSM: Add __init to fixup function.
        TOMOYO: Add pathname grouping support.
        ima: remove ACPI dependency
        TPM: ACPI/PNP dependency removal
        security/selinux/ss: Use kstrdup
        TOMOYO: Use stack memory for pending entry.
        Revert "ima: remove ACPI dependency"
        Revert "TPM: ACPI/PNP dependency removal"
        KEYS: Do preallocation for __key_link()
        TOMOYO: Use mutex_lock_interruptible.
        KEYS: Better handling of errors from construct_alloc_key()
        KEYS: keyring_serialise_link_sem is only needed for keyring->keyring links
        TOMOYO: Use GFP_NOFS rather than GFP_KERNEL.
        ima: remove ACPI dependency
        TPM: ACPI/PNP dependency removal
        selinux: generalize disabling of execmem for plt-in-heap archs
        LSM Audit: rename LSM_AUDIT_NO_AUDIT to LSM_AUDIT_DATA_NONE
        CRED: Holding a spinlock does not imply the holding of RCU read lock
        SMACK: Don't #include Ext2 headers
        ...
      96b5b7f4
    • Takashi Iwai's avatar
      Merge branch 'topic/asoc' into for-linus · d71f4cec
      Takashi Iwai authored
      Conflicts:
      	sound/soc/codecs/ad1938.c
      d71f4cec
    • Takashi Iwai's avatar
      Merge branch 'topic/hda' into for-linus · 19008bda
      Takashi Iwai authored
      19008bda
    • Takashi Iwai's avatar
      Merge branch 'topic/usb' into for-linus · 9ce3db4e
      Takashi Iwai authored
      9ce3db4e
    • Takashi Iwai's avatar
      Merge branch 'topic/jack' into for-linus · 20406f9b
      Takashi Iwai authored
      20406f9b
    • Takashi Iwai's avatar
      Merge branch 'topic/misc' into for-linus · 5e8aa852
      Takashi Iwai authored
      5e8aa852
    • Takashi Iwai's avatar
      Merge branch 'topic/nomm' into for-linus · 7bd9db83
      Takashi Iwai authored
      7bd9db83
    • Takashi Iwai's avatar
      3374cd1a
    • Tobias Klauser's avatar
      ALSA: hda: Storage class should be before const qualifier · fbc25669
      Tobias Klauser authored
      The C99 specification states in section 6.11.5:
      
      The placement of a storage-class specifier other than at the beginning
      of the declaration specifiers in a declaration is an obsolescent
      feature.
      Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      fbc25669
    • Jarkko Nikula's avatar
      ASoC: tpa6130a2: Remove CPVSS and HPVdd supplies · ad8332c1
      Jarkko Nikula authored
      These pins are for decoupling capacitors for the internal charge pumps
      in TPA6130A2 and TPA6140A2 and not for connecting external supply.
      
      Thanks to Eduardo Valentin <eduardo.valentin@nokia.com> for pointing out the
      issue with TPA6130A2 and Ilkka Koskinen <ilkka.koskinen@nokia.com> with
      TPA6140A2.
      Signed-off-by: default avatarJarkko Nikula <jhnikula@gmail.com>
      Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
      Reviewed-by: default avatarIlkka Koskinen <ilkka.koskinen@nokia.com>
      Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
      ad8332c1
    • Lin Ming's avatar
      ACPI: fix early DSDT dmi check warnings on ia64 · cce4f632
      Lin Ming authored
      WARNING: at drivers/firmware/dmi_scan.c:423 dmi_matches+0x70/0x160()
      dmi check: not initialized yet.
      
      This is caused by commit aa2110cb
      (ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT).
      DMI is not initialized yet in acpi_early_init on ia64.
      
      The DSDT DMI check table is x86 specific, so make it empty on other archs.
      And this fixes the warnings on ia64.
      Reported-and-tested-by: default avatarTony Luck <tony.luck@intel.com>
      Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      cce4f632
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux · f72caf7e
      Linus Torvalds authored
      * 'for-2.6.35' of git://linux-nfs.org/~bfields/linux: (45 commits)
        Revert "nfsd4: distinguish expired from stale stateids"
        nfsd: safer initialization order in find_file()
        nfs4: minor callback code simplification, comment
        NFSD: don't report compiled-out versions as present
        nfsd4: implement reclaim_complete
        nfsd4: nfsd4_destroy_session must set callback client under the state lock
        nfsd4: keep a reference count on client while in use
        nfsd4: mark_client_expired
        nfsd4: introduce nfs4_client.cl_refcount
        nfsd4: refactor expire_client
        nfsd4: extend the client_lock to cover cl_lru
        nfsd4: use list_move in move_to_confirmed
        nfsd4: fold release_session into expire_client
        nfsd4: rename sessionid_lock to client_lock
        nfsd4: fix bare destroy_session null dereference
        nfsd4: use local variable in nfs4svc_encode_compoundres
        nfsd: further comment typos
        sunrpc: centralise most calls to svc_xprt_received
        nfsd4: fix unlikely race in session replay case
        nfsd4: fix filehandle comment
        ...
      f72caf7e
    • Linus Torvalds's avatar
      Merge branch 'nfs-for-2.6.35' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 6a6be470
      Linus Torvalds authored
      * 'nfs-for-2.6.35' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (78 commits)
        SUNRPC: Don't spam gssd with upcall requests when the kerberos key expired
        SUNRPC: Reorder the struct rpc_task fields
        SUNRPC: Remove the 'tk_magic' debugging field
        SUNRPC: Move the task->tk_bytes_sent and tk_rtt to struct rpc_rqst
        NFS: Don't call iput() in nfs_access_cache_shrinker
        NFS: Clean up nfs_access_zap_cache()
        NFS: Don't run nfs_access_cache_shrinker() when the mask is GFP_NOFS
        SUNRPC: Ensure rpcauth_prune_expired() respects the nr_to_scan parameter
        SUNRPC: Ensure memory shrinker doesn't waste time in rpcauth_prune_expired()
        SUNRPC: Dont run rpcauth_cache_shrinker() when gfp_mask is GFP_NOFS
        NFS: Read requests can use GFP_KERNEL.
        NFS: Clean up nfs_create_request()
        NFS: Don't use GFP_KERNEL in rpcsec_gss downcalls
        NFSv4: Don't use GFP_KERNEL allocations in state recovery
        SUNRPC: Fix xs_setup_bc_tcp()
        SUNRPC: Replace jiffies-based metrics with ktime-based metrics
        ktime: introduce ktime_to_ms()
        SUNRPC: RPC metrics and RTT estimator should use same RTT value
        NFS: Calldata for nfs4_renew_done()
        NFS: Squelch compiler warning in nfs_add_server_stats()
        ...
      6a6be470
    • Linus Torvalds's avatar
      Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing · 98c89cdd
      Linus Torvalds authored
      * 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
        sunrpc: Include missing smp_lock.h
        procfs: Kill the bkl in ioctl
        procfs: Push down the bkl from ioctl
        procfs: Use generic_file_llseek in /proc/vmcore
        procfs: Use generic_file_llseek in /proc/kmsg
        procfs: Use generic_file_llseek in /proc/kcore
        procfs: Kill BKL in llseek on proc base
      98c89cdd
    • Linus Torvalds's avatar
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 164d44fd
      Linus Torvalds authored
      * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        clocksource: Add clocksource_register_hz/khz interface
        posix-cpu-timers: Optimize run_posix_cpu_timers()
        time: Remove xtime_cache
        mqueue: Convert message queue timeout to use hrtimers
        hrtimers: Provide schedule_hrtimeout for CLOCK_REALTIME
        timers: Introduce the concept of timer slack for legacy timers
        ntp: Remove tickadj
        ntp: Make time_adjust static
        time: Add xtime, wall_to_monotonic to feature-removal-schedule
        timer: Try to survive timer callback preempt_count leak
        timer: Split out timer function call
        timer: Print function name for timer callbacks modifying preemption count
        time: Clean up warp_clock()
        cpu-timers: Avoid iterating over all threads in fastpath_timer_check()
        cpu-timers: Change SIGEV_NONE timer implementation
        cpu-timers: Return correct previous timer reload value
        cpu-timers: Cleanup arm_timer()
        cpu-timers: Simplify RLIMIT_CPU handling
      164d44fd
    • Linus Torvalds's avatar
      Merge branch 'timers-fixes-for-linus' of... · 5bfec46b
      Linus Torvalds authored
      Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        cs5535-clockevt: Free timer in IRQ setup error path
      5bfec46b
    • Linus Torvalds's avatar
      Merge branch 'timers-for-linus-hpet' of... · 6fa0fddd
      Linus Torvalds authored
      Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, hpet: Add reference to chipset erratum documentation for disable-hpet-msi-quirk
        x86, hpet: Restrict read back to affected ATI chipsets
      6fa0fddd
    • Linus Torvalds's avatar
      Merge branch 'timers-for-linus-cleanups' of... · 7d02093e
      Linus Torvalds authored
      Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        avr32: Fix typo in read_persistent_clock()
        sparc: Convert sparc to use read/update_persistent_clock
        cris: Convert cris to use read/update_persistent_clock
        m68k: Convert m68k to use read/update_persistent_clock
        m32r: Convert m32r to use read/update_peristent_clock
        blackfin: Convert blackfin to use read/update_persistent_clock
        ia64: Convert ia64 to use read/update_persistent_clock
        avr32: Convert avr32 to use read/update_persistent_clock
        h8300: Convert h8300 to use read/update_persistent_clock
        frv: Convert frv to use read/update_persistent_clock
        mn10300: Convert mn10300 to use read/update_persistent_clock
        alpha: Convert alpha to use read/update_persistent_clock
        xtensa: Fix unnecessary setting of xtime
        time: Clean up direct xtime usage in xen
      7d02093e
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of... · 6e0b7b2c
      Linus Torvalds authored
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: Clear CPU mask in affinity_hint when none is provided
        genirq: Add CPU mask affinity hint
        genirq: Remove IRQF_DISABLED from core code
        genirq: Run irq handlers with interrupts disabled
        genirq: Introduce request_any_context_irq()
        genirq: Expose irq_desc->node in proc/irq
      
      Fixed up trivial conflicts in Documentation/feature-removal-schedule.txt
      6e0b7b2c
  3. 19 May, 2010 5 commits