Permalink
Commits on Oct 28, 2010
  1. Merge branch 'configs-2.6.36' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 28, 2010
  2. configs-2.6.36: add config file for Dell Inspiron 1525 laptop

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 28, 2010
Commits on Oct 25, 2010
  1. pf-2.6.36: remove -ck version info from Makefile

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 25, 2010
  2. Merge branch 'ck-2.6.36' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 25, 2010
  3. ck-2.6.36: update BFS to v357-1

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 25, 2010
  4. Merge branch 'bfq-2.6.36' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 25, 2010
  5. bfq-2.6.36: re-add BFQ I/O scheduler

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 25, 2010
  6. Revert "bfq-2.6.36: add BFQ I/O scheduler"

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 25, 2010
    This reverts commit a73d911.
Commits on Oct 22, 2010
  1. Merge remote branch 'tuxonice-2.6.36/combined' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 22, 2010
Commits on Oct 21, 2010
  1. Merge branch 'bfq-2.6.36' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 21, 2010
  2. bfq-2.6.36: add BFQ I/O scheduler

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 21, 2010
  3. Merge branch 'version-2.6.36' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 21, 2010
  4. version-2.6.36: point v2.6.36-pf1 in Makefile

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 21, 2010
  5. ck-2.6.36: merge 2.6.36-ck1 patchset

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 21, 2010
  6. Merge branch 'stable' into combined

    Nigel Cunningham
    Nigel Cunningham committed Oct 21, 2010
Commits on Oct 20, 2010
  1. Linux 2.6.36

    torvalds committed Oct 20, 2010
  2. Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-…

    torvalds committed Oct 20, 2010
    …linus
    
    * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
      MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls.
      MAINTAINERS: Change list for ioc_serial to linux-serial.
      SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure
      MIPS: jz4740: Fix Kbuild Platform file.
      MIPS: Repair Kbuild make clean breakage.
  3. virtio: console: Don't block entire guest if host doesn't read data

    Amit Shah authored and torvalds committed Oct 20, 2010
    If the host is slow in reading data or doesn't read data at all,
    blocking write calls not only blocked the program that called write()
    but the entire guest itself.
    
    To overcome this, let's not block till the host signals it has given
    back the virtio ring element we passed it.  Instead, send the buffer to
    the host and return to userspace.  This operation then becomes similar
    to how non-blocking writes work, so let's use the existing code for this
    path as well.
    
    This code change also ensures blocking write calls do get blocked if
    there's not enough room in the virtio ring as well as they don't return
    -EAGAIN to userspace.
    
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Acked-by: Hans de Goede <hdegoede@redhat.com>
    CC: stable@kernel.org
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixe…

    torvalds committed Oct 20, 2010
    …s-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] bsg: fix incorrect device_status value
      [SCSI] Fix VPD inquiry page wrapper
  5. Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/vir…

    torvalds committed Oct 20, 2010
    …t/kvm/kvm
    
    * 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: Fix fs/gs reload oops with invalid ldt
Commits on Oct 19, 2010
  1. MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO sysc…

    michel-thebeau-WR authored and ralfbaechle committed Sep 28, 2010
    …alls.
    
    [Ralf: Michel's original patch only fixed N32; I replicated the same fix
    for O32.]
    
    Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
    Cc: paul.gortmaker@windriver.com
    Cc: bruce.ashfield@windriver.com
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  2. MAINTAINERS: Change list for ioc_serial to linux-serial.

    ralfbaechle committed Oct 19, 2010
    IOC3 is also being used on SGI MIPS systems but this particular driver is
    only being used on IA64 systems so linux-mips made no sense as a list.  Pat
    also thinks linux-serial@vger.kernel.org is the better list.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  3. SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure

    JuliaLawall authored and ralfbaechle committed Oct 15, 2010
    In this code, 0 is returned on memory allocation failure, even though other
    failures return -ENOMEM or other similar values.
    
    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    expression ret;
    expression x,e1,e2,e3;
    @@
    
    ret = 0
    ... when != ret = e1
    *x = \(kmalloc\|kcalloc\|kzalloc\)(...)
    ... when != ret = e2
    if (x == NULL) { ... when != ret = e3
      return ret;
    }
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    To: Pat Gefre <pfg@sgi.com>
    Cc: kernel-janitors@vger.kernel.org
    Cc: linux-ia64@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/1704/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  4. MIPS: jz4740: Fix Kbuild Platform file.

    David Daney authored and ralfbaechle committed Oct 19, 2010
    The platform specific files should be included via the platform-y
    variable.
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Cc: Lars-Peter Clausen <lars@metafoo.de>
    Patchwork: https://patchwork.linux-mips.org/patch/1719/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  5. MIPS: Repair Kbuild make clean breakage.

    David Daney authored and ralfbaechle committed Oct 19, 2010
    When running make clean, Kbuild doesn't process the .config file, so nothing
    generates a platform-y variable.  We can get it to descend into the platform
    directories by setting $(obj-).
    
    The dec Platform file was unconditionally setting platform-, obliterating
    its previous contents and preventing some directories from being cleaned.
    This is change to an append operation '+=' to allow cavium-octeon to be
    cleaned.
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Patchwork: https://patchwork.linux-mips.org/patch/1718/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  6. Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Oct 19, 2010
    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: avivo cursor workaround applies to evergreen as well
  7. KVM: Fix fs/gs reload oops with invalid ldt

    Avi Kivity Marcelo Tosatti
    Avi Kivity authored and Marcelo Tosatti committed Oct 19, 2010
    kvm reloads the host's fs and gs blindly, however the underlying segment
    descriptors may be invalid due to the user modifying the ldt after loading
    them.
    
    Fix by using the safe accessors (loadsegment() and load_gs_index()) instead
    of home grown unsafe versions.
    
    This is CVE-2010-3698.
    
    KVM-Stable-Tag.
    Signed-off-by: Avi Kivity <avi@redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Commits on Oct 18, 2010
  1. Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-…

    torvalds committed Oct 18, 2010
    …linus
    
    * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
      MIPS: Enable ISA_DMA_API config to fix build failure
      MIPS: 32-bit: Fix build failure in asm/fcntl.h
      MIPS: Remove all generated vmlinuz* files on "make clean"
      MIPS: do_sigaltstack() expects userland pointers
      MIPS: Fix error values in case of bad_stack
      MIPS: Sanitize restart logics
      MIPS: secure_computing, syscall audit: syscall number should in r2, not r0.
      MIPS: Don't block signals if we'd failed to setup a sigframe
  2. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Oct 18, 2010
    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: evdev - fix EVIOCSABS regression
      Input: evdev - fix Ooops in EVIOCGABS/EVIOCSABS
  3. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Oct 18, 2010
    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: ohci: fix TI TSB82AA2 regression since 2.6.35
  4. mxc_nand: do not depend on disabling the irq in the interrupt handler

    saschahauer authored and torvalds committed Oct 18, 2010
    This patch reverts the driver to enabling/disabling the NFC interrupt
    mask rather than enabling/disabling the system interrupt.  This cleans
    up the driver so that it doesn't rely on interrupts being disabled
    within the interrupt handler.
    
    For i.MX21 we keep the current behaviour, that is calling
    enable_irq/disable_irq_nosync to enable/disable interrupts.  This patch
    is based on earlier work by John Ogness.
    
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Acked-by: John Ogness <john.ogness@linutronix.de>
    Tested-by: John Ogness <john.ogness@linutronix.de>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. Merge branch 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/…

    torvalds committed Oct 18, 2010
    …linux
    
    * 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/linux:
      i2c-imx: do not allow interruptions when waiting for I2C to complete
      i2c-davinci: Fix TX setup for more SoCs
  6. Merge branch 'fixes'

    torvalds committed Oct 18, 2010
    * fixes:
      v4l1: fix 32-bit compat microcode loading translation
      De-pessimize rds_page_copy_user
  7. MIPS: Enable ISA_DMA_API config to fix build failure

    namhyung authored and ralfbaechle committed Oct 18, 2010
    Add ISA_DMA_API config item and select it when GENERIC_ISA_DMA enabled.
    This fixes build failure on allmodconfig like following:
    
      CC      sound/isa/es18xx.o
    sound/isa/es18xx.c: In function 'snd_es18xx_playback1_prepare':
    sound/isa/es18xx.c:501:9: error: implicit declaration of function 'snd_dma_program'
    sound/isa/es18xx.c: In function 'snd_es18xx_playback_pointer':
    sound/isa/es18xx.c:818:3: error: implicit declaration of function 'snd_dma_pointer'
    make[3]: *** [sound/isa/es18xx.o] Error 1
    make[2]: *** [sound/isa/es18xx.o] Error 2
    make[1]: *** [sub-make] Error 2
    make: *** [all] Error 2
    
    Signed-off-by: Namhyung Kim <namhyung@gmail.com>
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/1717/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  8. MIPS: 32-bit: Fix build failure in asm/fcntl.h

    namhyung authored and ralfbaechle committed Oct 17, 2010
      CC      security/integrity/ima/ima_fs.o
    In file included from linux/include/linux/fcntl.h:4:0,
                     from linux/security/integrity/ima/ima_fs.c:18:
    linux/arch/mips/include/asm/fcntl.h:63:2: error: expected specifier-qualifier-list before 'off_t'
    make[3]: *** [security/integrity/ima/ima_fs.o] Error 1
    make[2]: *** [security/integrity/ima/ima_fs.o] Error 2
    make[1]: *** [sub-make] Error 2
    make: *** [all] Error 2
    
    Signed-off-by: Namhyung Kim <namhyung@gmail.com>
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/1715/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>