Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.35-rc1
Commits on May 30, 2010
  1. Linus Torvalds

    Linux 2.6.35-rc1

    torvalds authored
    .. and thus endeth the merge window.
  2. Linus Torvalds

    Merge branch 'slub/urgent' of git://git.kernel.org/pub/scm/linux/kern…

    torvalds authored
    …el/git/penberg/slab-2.6
    
    * 'slub/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
      SLUB: Allow full duplication of kmalloc array for 390
      slub: move kmem_cache_node into it's own cacheline
  3. Linus Torvalds

    Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds authored
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      mutex: Fix optimistic spinning vs. BKL
  4. Linus Torvalds

    Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds authored
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf tui: Fix last use_browser problem related to .perfconfig
      perf symbols: Add the build id cache to the vmlinux path
      perf tui: Reset use_browser if stdout is not a tty
      ring-buffer: Move zeroing out excess in page to ring buffer code
      ring-buffer: Reset "real_end" when page is filled
  5. Linus Torvalds

    ia64: revert __node_random addition

    torvalds authored
    This partially reverts commit 4ec37de
    ("[IA64] Fix build breakage"), since the commit that made it necessary
    got reverted earlier (see commit 35926ff, 'Revert "cpusets:
    randomize node rotor used in cpuset_mem_spread_node()"')
    
    Even if we ever re-introduce this, there is no reason to make
    __node_random be some architecture-specific function.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/mszeredi/fuse
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
      mm: export generic_pipe_buf_*() to modules
      fuse: support splice() reading from fuse device
      fuse: allow splice to move pages
      mm: export remove_from_page_cache() to modules
      mm: export lru_cache_add_*() to modules
      fuse: support splice() writing to fuse device
      fuse: get page reference for readpages
      fuse: use get_user_pages_fast()
      fuse: remove unneeded variable
  7. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/rostedt/linux-2.6-kconfig
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig:
      kconfig: Hide error output in find command in streamline_config.pl
      kconfig: Fix typo in comment in streamline_config.pl
      kconfig: Make a variable local in streamline_config.pl
  8. Linus Torvalds

    Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds authored
    …git/sameo/mfd-2.6
    
    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (47 commits)
      mfd: Rename twl5031 sih modules
      mfd: Storage class for timberdale should be before const qualifier
      mfd: Remove unneeded and dangerous clearing of clientdata
      mfd: New AB8500 driver
      gpio: Fix inverted rdc321x gpio data out registers
      mfd: Change rdc321x resources flags to IORESOURCE_IO
      mfd: Move pcf50633 irq related functions to its own file.
      mfd: Use threaded irq for pcf50633
      mfd: pcf50633-adc: Fix potential race in pcf50633_adc_sync_read
      mfd: Fix pcf50633 bitfield logic in interrupt handler
      gpio: rdc321x needs to select MFD_CORE
      mfd: Use menuconfig for quicker config editing
      ARM: AB3550 board configuration and irq for U300
      mfd: AB3550 core driver
      mfd: AB3100 register access change to abx500 API
      mfd: Renamed ab3100.h to abx500.h
      gpio: Add TC35892 GPIO driver
      mfd: Add Toshiba's TC35892 MFD core
      mfd: Delay to mask tsc irq in max8925
      mfd: Remove incorrect wm8350 kfree
      ...
  9. Linus Torvalds

    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/…

    torvalds authored
    …djbw/async_tx
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
      DMAENGINE: DMA40 U8500 platform configuration
      DMA: PL330: Add dma api driver
  10. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      IB/qib: Remove DCA support until feature is finished
      IB/qib: Use a single txselect module parameter for serdes tuning
      IB/qib: Don't rely on (undefined) order of function parameter evaluation
      IB/ucm: Use memdup_user()
      IB/qib: Fix undefined symbol error when CONFIG_PCI_MSI=n
  11. Linus Torvalds

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/jack/linux-fs-2.6
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
      quota: Convert quota statistics to generic percpu_counter
      ext3 uses rb_node = NULL; to zero rb_root.
      quota: Fixup dquot_transfer
      reiserfs: Fix resuming of quotas on remount read-write
      pohmelfs: Remove dead quota code
      ufs: Remove dead quota code
      udf: Remove dead quota code
      quota: rename default quotactl methods to dquot_
      quota: explicitly set ->dq_op and ->s_qcop
      quota: drop remount argument to ->quota_on and ->quota_off
      quota: move unmount handling into the filesystem
      quota: kill the vfs_dq_off and vfs_dq_quota_on_remount wrappers
      quota: move remount handling into the filesystem
      ocfs2: Fix use after free on remount read-only
    
    Fix up conflicts in fs/ext4/super.c and fs/ufs/file.c
  12. Linus Torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, cpufeature: Unbreak compile with gcc 3.x
      x86, pat: Fix memory leak in free_memtype
      x86, k8: Fix section mismatch for powernowk8_exit()
      lib/atomic64_test: fix missing include of linux/kernel.h
      x86: remove last traces of quicklist usage
      x86, setup: Phoenix BIOS fixup is needed on Dell Inspiron Mini 1012
      x86: "nosmp" command line option should force the system into UP mode
      arch/x86/pci: use kasprintf
      x86, apic: ack all pending irqs when crashed/on kexec
  13. Rafael J. Wysocki Linus Torvalds

    CPU: Avoid using unititialized error variable in disable_nonboot_cpus()

    rjwysocki authored torvalds committed
    If there's only one CPU online when disable_nonboot_cpus() is called,
    the error variable will not be initialized and that may lead to
    erroneous behavior.  Fix this issue by initializing error in
    disable_nonboot_cpus() as appropriate.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. Linus Torvalds

    rapidio: fix new kernel-doc warnings

    Randy Dunlap authored torvalds committed
    Fix a bunch of new rapidio kernel-doc warnings:
    
    Warning(include/linux/rio.h:123): No description found for parameter 'comp_tag'
    Warning(include/linux/rio.h:123): No description found for parameter 'phys_efptr'
    Warning(include/linux/rio.h:123): No description found for parameter 'em_efptr'
    Warning(include/linux/rio.h:123): No description found for parameter 'pwcback'
    Warning(include/linux/rio.h:247): No description found for parameter 'set_domain'
    Warning(include/linux/rio.h:247): No description found for parameter 'get_domain'
    Warning(drivers/rapidio/rio-scan.c:1133): No description found for parameter 'rdev'
    Warning(drivers/rapidio/rio-scan.c:1133): Excess function parameter 'port' description in 'rio_init_em'
    Warning(drivers/rapidio/rio.c:349): No description found for parameter 'rdev'
    Warning(drivers/rapidio/rio.c:349): Excess function parameter 'mport' description in 'rio_request_inb_pwrite'
    Warning(drivers/rapidio/rio.c:393): No description found for parameter 'port'
    Warning(drivers/rapidio/rio.c:393): No description found for parameter 'local'
    Warning(drivers/rapidio/rio.c:393): No description found for parameter 'destid'
    Warning(drivers/rapidio/rio.c:393): No description found for parameter 'hopcount'
    Warning(drivers/rapidio/rio.c:393): Excess function parameter 'rdev' description in 'rio_mport_get_physefb'
    Warning(drivers/rapidio/rio.c:845): Excess function parameter 'local' description in 'rio_std_route_clr_table'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Alexandre Bounine <alexandre.bounine@idt.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. Linus Torvalds

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git…

    torvalds authored
    …/kyle/parisc-2.6
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
      parisc: Call pagefault_disable/pagefault_enable in kmap_atomic/kunmap_atomic
      parisc: Remove unnecessary macros from entry.S
      parisc: LWS fixes for syscall.S
      parisc: Delete unnecessary nop's in entry.S
      parisc: Avoid interruption in critical region in entry.S
      parisc: invoke oom-killer from page fault
      parisc: clear floating point exception flag on SIGFPE signal
      parisc: Use of align_frame provides stack frame.
  16. Linus Torvalds

    Revert "cpusets: randomize node rotor used in cpuset_mem_spread_node()"

    torvalds authored
    This reverts commit 0ac0c0d, which
    caused cross-architecture build problems for all the wrong reasons.
    IA64 already added its own version of __node_random(), but the fact is,
    there is nothing architectural about the function, and the original
    commit was just badly done. Revert it, since no fix is forthcoming.
    
    Requested-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/sage/ceph-client
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      ceph: clean up on forwarded aborted mds request
      ceph: fix leak of osd authorizer
      ceph: close out mds, osd connections before stopping auth
      ceph: make lease code DN specific
      fs/ceph: Use ERR_CAST
      ceph: renew auth tickets before they expire
      ceph: do not resend mon requests on auth ticket renewal
      ceph: removed duplicated #includes
      ceph: avoid possible null dereference
      ceph: make mds requests killable, not interruptible
      sched: add wait_for_completion_killable_timeout
  18. SLUB: Allow full duplication of kmalloc array for 390

    Christoph Lameter authored Pekka Enberg committed
    Commit 756dee7 ("SLUB: Get rid of dynamic DMA
    kmalloc cache allocation") makes S390 run out of kmalloc caches.  Increase the
    number of kmalloc caches to a safe size.
    
    Cc: <stable@kernel.org> [ .33 and .34 ]
    Reported-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Tested-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Christoph Lameter <cl@linux-foundation.org>
    Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
  19. parisc: Call pagefault_disable/pagefault_enable in kmap_atomic/kunmap…

    John David Anglin authored Kyle McMartin committed
    …_atomic
    
    Based on the generic implementation of kmap_atomic and kunmap_atomic,
    we should call pagefault_disable and pagefault_enable in our PA8000
    implementation.
    
    The define for kmap_atomic_prot was also missing, and I updated
    kmap_atomic_pfn to use the generic implementation because of the
    change to kmap_atomic.
    
    I believe that this change is needed to fix the fork copy-on-write
    bug.
    
    Signed-off-by: John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  20. parisc: Remove unnecessary macros from entry.S

    John David Anglin authored Kyle McMartin committed
    The EXTR, DEP and DEPI macros are unnecessary.  There are PA 1.X
    pneumonics available with the same functionality, and the DEP and DEPI
    macros conflict with assembler pneumonics.
    
    Tested on a variety of 32 and 64-bit systems.
    
    Signed-off-by: John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  21. parisc: LWS fixes for syscall.S

    John David Anglin authored Kyle McMartin committed
    1) Gate immediately and save a branch.
    2) Fix off by one error in checking entry number.
    3) Use sr7 instead of sr3 in error return path as sr3 might not
       contain correct value.
    4) Enable locking on UP systems to prevent incorrect operation of
       the cas_action critical region on page faults.
    
    Tested on several systems, including UP c3750 with 2.6.33.2 kernel.
    
    Signed-off-by: John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  22. parisc: Delete unnecessary nop's in entry.S

    John David Anglin authored Kyle McMartin committed
    Signed-off-by: John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  23. parisc: Avoid interruption in critical region in entry.S

    John David Anglin authored Kyle McMartin committed
    Signed-off-by: John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  24. parisc: invoke oom-killer from page fault

    Nick Piggin authored Kyle McMartin committed
    As explained in commit 1c0fe6e, we want to call the architecture independent
    oom killer when getting an unexplained OOM from handle_mm_fault, rather than
    simply killing current.
    
    Cc: linux-parisc@vger.kernel.org
    Cc: linux-arch@vger.kernel.org
    Signed-off-by: Nick Piggin <npiggin@suse.de>
    Acked-by: David Rientjes <rientjes@google.com>
    Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
  25. parisc: clear floating point exception flag on SIGFPE signal

    Helge Deller authored Kyle McMartin committed
    Clear the floating point exception flag before returning to
    user space. This is needed, else the libc trampoline handler
    may hit the same SIGFPE again while building up a trampoline
    to a signal handler.
    
    Fixes debian bug #559406.
    
    Signed-off-by: Helge Deller <deller@gmx.de>
    Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
  26. Carlos O'Donell

    parisc: Use of align_frame provides stack frame.

    codonell authored Kyle McMartin committed
    Any assembly constant generated with the use of
    align_frame includes size for a full stack frame.
    
    Signed-off-by: Carlos O'Donell <carlos@systemhalted.org>
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Commits on May 29, 2010
  1. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (26 commits)
      ALSA: snd-usb-caiaq: Bump version number to 1.3.21
      ALSA: Revert "ALSA: snd-usb-caiaq: Set default input mode of A4DJ"
      ALSA: snd-usb-caiaq: Simplify single case to an 'if'
      ALSA: snd-usb-caiaq: Restore 'Control vinyl' input mode on A4DJ
      ALSA: hda: Use LPIB for a Shuttle device
      ALSA: hda: Add support for another Lenovo ThinkPad Edge in conexant codec
      ALSA: hda: Use LPIB for Sony VPCS11V9E
      ALSA: usb-audio: fix feature unit parser for UAC2
      ALSA: asihpi - Minor code cleanup
      ALSA: asihpi - Add support for new ASI8800 family
      ALSA: asihpi - Fix bug preventing outstream_write preload from happening
      ALSA: asihpi - Fix imbalanced lock path in hw_message
      ALSA: asihpi - Remove support for old ASI8800 family
      ALSA: asihpi - Add hd radio blend functions
      ALSA: asihpi - Remove unused io map functions
      ALSA: usb-audio: add support for UAC2 pitch control
      ALSA: usb-audio: parse UAC2 endpoint descriptors correctly
      ALSA: usb-audio: fix return values
      ALSA: usb-audio: parse more format descriptors with structs
      sound: Add missing spin_unlock
      ...
  2. Takashi Iwai
  3. Takashi Iwai
  4. Takashi Iwai
  5. Takashi Iwai

    ALSA: snd-usb-caiaq: Bump version number to 1.3.21

    Mark Hills authored tiwai committed
    Acked-by: Daniel Mack <daniel@caiaq.de>
    Signed-off-by: Mark Hills <mark@pogo.org.uk>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  6. Takashi Iwai

    ALSA: Revert "ALSA: snd-usb-caiaq: Set default input mode of A4DJ"

    Mark Hills authored tiwai committed
    Do not explicity set the default input mode. Use the hardware default
    of mode 0 ('Control vinyl'), which is now available.
    
    This reverts commit e3ca4c9.
    
    Acked-by: Daniel Mack <daniel@caiaq.de>
    Signed-off-by: Mark Hills <mark@pogo.org.uk>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  7. Takashi Iwai

    ALSA: snd-usb-caiaq: Simplify single case to an 'if'

    Mark Hills authored tiwai committed
    After removing code, only one case remains. So use an 'if' instead.
    
    Acked-by: Daniel Mack <daniel@caiaq.de>
    Signed-off-by: Mark Hills <mark@pogo.org.uk>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  8. Takashi Iwai

    ALSA: snd-usb-caiaq: Restore 'Control vinyl' input mode on A4DJ

    Mark Hills authored tiwai committed
    This feature was undocumented on early A4DJ units. It is indicated
    by lighting both the 'line' and 'phono' lamps at the same time.
    Newer units document this and the newer Windows drivers enable this
    for all units, so restore the functionality.
    
    This patch simplifies the code and changes the mode mapping to match
    the A8DJ, favouring simpler code and consistency over keeping the
    existing mapping.
    
    Both 'Control vinyl' and 'Phono' input modes enable the hardware
    preamp. The difference is the input impedance.
    
    This reverts commit 9a9527e.
    
    Acked-by: Daniel Mack <daniel@caiaq.de>
    Signed-off-by: Mark Hills <mark@pogo.org.uk>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  9. Dan Chen Takashi Iwai

    ALSA: hda: Use LPIB for a Shuttle device

    crimsun authored tiwai committed
    BugLink: https://launchpad.net/bugs/551949
    
    Symptom: On the reporter's Shuttle device, using PulseAudio in Ubuntu
    10.04 LTS results in "popping clicking" audio with the PA crashing
    shortly thereafter.
    
    Test case: Using Ubuntu 10.04 LTS (Linux 2.6.32.12), Linux 2.6.33, or
    Linux 2.6.34, adjust the HDA device's volume with PulseAudio.
    
    Resolution: add SSID for this machine to the position_fix quirk table,
    explicitly specifying the LPIB method.
    
    Reported-and-Tested-By: Christian Mehlis <mehlis@inf.fu-berlin.de>
    Cc: <stable@kernel.org>
    Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
Something went wrong with that request. Please try again.