1. 26 May, 2010 1 commit
  2. 25 May, 2010 9 commits
    • Clemens Ladisch's avatar
      ALSA: emu10k1: allow high-resolution mixer controls · 4daf7a0c
      Clemens Ladisch authored
      Add a module option to allow the GPR mixer controls to have the full
      resolution of the hardware, i.e., 0...2^31-1 instead of 0...100.
      
      Because of bugs in userspace tools like alsactl and alsamixer, this is
      not yet enabled by default.
      Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      4daf7a0c
    • Clemens Ladisch's avatar
      ALSA: pcm: fix delta calculation at boundary wraparound · b406e610
      Clemens Ladisch authored
      In the cleanup of the hw_ptr update functions in 2.6.33, the calculation
      of the delta value was changed to use the modulo operator to protect
      against a negative difference due to the pointer wrapping around at the
      boundary.
      
      However, the ptr variables are unsigned, so a negative difference would
      result in the two complement's value which has no relation to the actual
      difference relative to the boundary; the result is typically some value
      near LONG_MAX-boundary.  Furthermore, even if the modulo operation would
      be done with signed types, the result of a negative dividend could be
      negative.
      
      The invalid delta value is then caught by the following checks, but this
      means that the pointer update is ignored.
      
      To fix this, use a range check as in the other pointer calculations.
      Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      b406e610
    • Clemens Ladisch's avatar
      ALSA: hda_intel: fix handling of non-completion stream interrupts · 9ef04066
      Clemens Ladisch authored
      Check that the interrupt raised for a stream is actually a buffer
      completion interrupt before handling it as one.  Otherwise, memory
      errors or FIFO xruns would be interpreted as a pointer update and could
      break the stream timing.
      Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      9ef04066
    • Daniel Mack's avatar
      57c7ffc9
    • Daniel T Chen's avatar
      ALSA: hda: Fix model quirk for Dell M1730 · 66668b6f
      Daniel T Chen authored
      BugLink: https://launchpad.net/bugs/576160
      
      Symptom: Currently (2.6.32.12) the Dell M1730 uses the 3stack model
      quirk. Unfortunately this means that capture is not functional out-
      of-the-box despite ensuring that capture settings are unmuted and
      raised fully.
      
      Test case: boot from Ubuntu 10.04 LTS live cd; capture does not
      work.
      
      Resolution: Correct the model quirk for Dell M1730 to rely on the
      BIOS configuration.
      
      This patch also trivially sorts the quirk into the correct section
      based on the comments.
      
      Reported-and-Tested-By: <picdragon99@msn.com>
      Tested-By: Daren Hayward
      Tested-By: Tobias Krais
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarDaniel T Chen <crimsun@ubuntu.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      66668b6f
    • Justin P. Mattock's avatar
      ALSA: hda - iMac9,1 sound fixes · b7cccc52
      Justin P. Mattock authored
      First issue:
      With the original patch, I've noticed by unmuting the mic
      (and even having it muted), there is a distorted("Noise")
      coming from the internal speakers, even when the headphones are plugged in.
      What my finding's revealed is:
      
      	/* Mic (rear) pin: input vref at 80% */
      	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
      	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
      
      From the original patch. Looking at codec#0 0x18/0x1a is listed as:
      
      Node 0x18 [Pin Complex] wcaps 0x40018f: Stereo Amp-In Amp-Out
        Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0
        Amp-In vals:  [0x00 0x00]
        Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1
        Amp-Out vals:  [0x00 0x00]
        Pincap 0x0000373c: IN OUT HP Detect
          Vref caps: HIZ 50 GRD 80 100
        Pin Default 0x90100141: [Fixed] Speaker at Int N/A
          Conn = Unknown, Color = Unknown
          DefAssociation = 0x4, Sequence = 0x1
          Misc = NO_PRESENCE
        Pin-ctls: 0x41: OUT VREF_50
        Unsolicited: tag=00, enabled=0
        Connection: 5
           0x0c* 0x0d 0x0e 0x0f 0x26
      
      seems this Node is listed as: [Fixed] Speaker while 0x15
      
      Node 0x15 [Pin Complex] wcaps 0x40018f: Stereo Amp-In Amp-Out
        Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0
        Amp-In vals:  [0x00 0x00]
        Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1
        Amp-Out vals:  [0x80 0x80]
        Pincap 0x0000373c: IN OUT HP Detect
          Vref caps: HIZ 50 GRD 80 100
        Pin Default 0x018b3020: [Jack] Line In at Ext Rear
          Conn = Comb, Color = Blue
          DefAssociation = 0x2, Sequence = 0x0
        Pin-ctls: 0x01: VREF_50
        Unsolicited: tag=00, enabled=0
        Connection: 5
           0x0c 0x0d* 0x0e 0x0f 0x26
      
      is [Jack] Line In at Ext Rear.
      (looking at the other apple products as examples
      I came up with the fix below).
      
      Second issue:
      alc885_mbp_4ch_modes
      The original patch does a good job with the
      HP pin automute function, but from what I noticed is I would have to manually
      change the channel form 2 to 4 after plugging the headphones in.
      And not to mention having odd moments to where I was jamming out
      with the headphones on, then later realized I had sound blasting out
      of the speakers as well. My findings revealed that changing
      alc885_mbp_4ch_modes to alc885_mba21_ch_modes and setting
      -	spec->autocfg.speaker_pins[0] = 0x15;
      +	spec->autocfg.speaker_pins[0] = 0x18;
      gets the automute function when the headphones plugged in working
      flawlessly(and the no need to manually change the channel number
      afterwards).
      
      Third issue:
      alc885_imac91_mixer
      There probably doesnt need to be anything changed with this
      (esspecially if your one to like lots of sliders),but my findings
      revealed that mac osx only has a master on the top right,
      another switch on itunes, and then a slider for the mic.
      
      So the changes I did below try and mimic osx as much as possible
      (only thing I had an issue with is just having one mute switch
      on the master, instead of having two(still investigating)).
      
      fourth issue:
      alc882_capture_source
      I endeded up creating alc889A_imac91_capture_source()
      only  because looking at alc882_capture_source I see
      that the mic is set to 0x1 while this works, I also noticed
      that adding 0x1 and 0x01 and testing that 0x1 somehow
      stops working, and 0x01 works(so I figured 0x01 was more
      of the alpha of the numbers(still need to figure out
      where that valuse is)). In any case the microphone
      does work with the original, and with the below patch, but both
      still record not as clean(lots of "Noise", which I would like to
      look into too).
      Note: using alsamixer -Va reveals the capture switches.
      Signed-off-by: default avatarJustin P. Mattock <justinmattock@gmail.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      b7cccc52
    • Daniel T Chen's avatar
      ALSA: hda: Use LPIB for Toshiba A100-259 · 4e0938db
      Daniel T Chen authored
      BugLink: https://launchpad.net/bugs/549560
      
      Symptom: on a significant number of hardware, booting from a live cd
      results in capture working correctly, but once the distribution is
      installed, booting from the install results in capture not working.
      
      Test case: boot from Ubuntu 10.04 LTS live cd; capture works correctly.
      Install to HD and reboot; capture does not work. Reproduced with 2.6.32
      mainline build (vanilla kernel.org compile)
      
      Resolution: add SSID for Toshiba A100-259 to the position_fix quirk
      table, explicitly specifying the LPIB method.
      
      I'll be sending additional patches for these SSIDs as bug reports are
      confirmed.
      
      This patch also trivially sorts the quirk table in ascending order by
      subsystem vendor.
      
      Reported-and-Tested-by: <davide.molteni@gmail.com>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarDaniel T Chen <crimsun@ubuntu.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      4e0938db
    • Daniel T Chen's avatar
      ALSA: hda: Use LPIB for Acer Aspire 5110 · 7a68be94
      Daniel T Chen authored
      BugLink: https://launchpad.net/bugs/583983
      
      Symptom: on a significant number of hardware, booting from a live cd
      results in capture working correctly, but once the distribution is
      installed, booting from the install results in capture not working.
      
      Test case: boot from Ubuntu 10.04 LTS live cd; capture works correctly.
      Install to HD and reboot; capture does not work. Reproduced with 2.6.32
      mainline build (vanilla kernel.org compile).
      
      Resolution: add SSID for Acer Aspire 5110 to the position_fix quirk
      table, explicitly specifying the LPIB method.
      
      I'll be sending additional patches for these SSIDs as bug reports are
      confirmed.
      
      Reported-and-Tested-By: Leo
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarDaniel T Chen <crimsun@ubuntu.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      7a68be94
    • H Hartley Sweeten's avatar
      ALSA: aw2-alsa.c: use pci_ids.h defines and fix checkpatch.pl noise · 34329fae
      H Hartley Sweeten authored
      Use the VENDOR/DEVICE ids provided in pci_ids.h instead of creating
      local ids of the same values.
      
      Also, fix the following checkpatch.pl warnings:
      
      WARNING: Use #include <linux/io.h> instead of <asm/io.h>
      WARNING: unnecessary whitespace before a quoted newline
      Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      34329fae
  3. 21 May, 2010 2 commits
  4. 20 May, 2010 28 commits
    • 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
    • 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