Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.30-rc2
Commits on Apr 14, 2009
  1. @torvalds

    Linux 2.6.30-rc2

    torvalds authored
  2. @torvalds

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

    torvalds authored
    …ernel/git/anholt/drm-intel
    
    * 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
      drm/i915: fix scheduling while holding the new active list spinlock
      drm/i915: Allow tiling of objects with bit 17 swizzling by the CPU.
      drm/i915: Correctly set the write flag for get_user_pages in pread.
      drm/i915: Fix use of uninitialized var in 40a5f0d
      drm/i915: indicate framebuffer restore key in SysRq help message
      drm/i915: sync hdmi detection by hdmi identifier with 2D
      drm/i915: Fix a mismerge of the IGD patch (new .find_pll hooks missed)
      drm/i915: Implement batch and ring buffer dumping
  3. @torvalds

    x86 microcode: revert some work_on_cpu

    Hugh Dickins authored torvalds committed
    Revert part of af5c820 ("x86: cpumask:
    use work_on_cpu in arch/x86/kernel/microcode_core.c")
    
    That change is causing only one Intel CPU's microcode to be updated e.g.
    microcode: CPU3 updated from revision 0x9 to 0x17, date = 2005-04-22
    where before it announced that also for CPU0 and CPU1 and CPU2.
    
    We cannot use work_on_cpu() in the CONFIG_MICROCODE_OLD_INTERFACE code,
    because Intel's request_microcode_user() involves a copy_from_user() from
    /sbin/microcode_ctl, which therefore needs to be on that CPU at the time.
    
    Signed-off-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @anholt

    drm/i915: fix scheduling while holding the new active list spinlock

    Shaohua Li authored anholt committed
    regression caused by commit 5e118f4:
    i915_gem_object_move_to_inactive() should be called in task context,
    as it calls fput();
    
    Signed-off-by: Shaohua Li<shaohua.li@intel.com>
    [anholt: Add more detail to the comment about the lock break that's added]
    Signed-off-by: Eric Anholt <eric@anholt.net>
  5. @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:
      lockdep: warn about lockdep disabling after kernel taint, fix
  6. @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:
      fuse: fix "direct_io" private mmap
      fuse: fix argument type in fuse_get_user_pages()
  7. @torvalds

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

    torvalds authored
    …/git/ryusuke/nilfs2
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
      nilfs2: fix possible mismatch of sufile counters on recovery
      nilfs2: segment usage file cleanups
      nilfs2: fix wrong accounting and duplicate brelse in nilfs_sufile_set_error
      nilfs2: simplify handling of active state of segments fix
      nilfs2: remove module version
      nilfs2: fix lockdep recursive locking warning on meta data files
      nilfs2: fix lockdep recursive locking warning on bmap
      nilfs2: return f_fsid for statfs2
  8. @torvalds

    Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-micro…

    torvalds authored
    …blaze
    
    * 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
      microblaze: Add missing FILE tag to MAINTAINERS
      microblaze: remove duplicated #include's
      microblaze: struct device - replace bus_id with dev_name()
      microblaze: Simplify copy_thread()
      microblaze: Add TIMESTAMPING constants to socket.h
      microblaze: Add missing empty ftrace.h file
      microblaze: Fix problem with removing zero length files
  9. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: Add in PCI bus for DMA API debugging.
      sh: Pre-allocate a reasonable number of DMA debug entries.
      sh: sh7786: modify usb setup timeout judgment bug.
      MAINTAINERS: Update sh architecture file patterns.
      sh: ap325: use edge control for ov772x camera
      sh: Plug in support for ARCH=sh64 using sh SRCARCH.
      sh: urquell: Fix up address mapping in board comments.
      sh: Add support for DMA API debugging.
      sh: Provide cpumask_of_pcibus() to fix NUMA build.
      sh: urquell: Add board comment
      sh: wire up sys_preadv/sys_pwritev() syscalls.
      sh: sh7785lcr: fix PCI address map for 32-bit mode
      sh: intc: Added resume from hibernation support to the intc
  10. @torvalds

    Fix lpfc_parse_bg_err()'s use of do_div()

    David Howells authored torvalds committed
    Fix lpfc_parse_bg_err()'s use of do_div().  It should be passing a 64-bit
    variable as the first parameter.  However, since it's only using a 32-bit
    variable, it doesn't need to use do_div() at all, but can instead use the
    division operator.
    
    This deals with the following warnings:
    
        CC      drivers/scsi/lpfc/lpfc_scsi.o
      drivers/scsi/lpfc/lpfc_scsi.c: In function 'lpfc_parse_bg_err':
      drivers/scsi/lpfc/lpfc_scsi.c:1397: warning: comparison of distinct pointer types lacks a cast
      drivers/scsi/lpfc/lpfc_scsi.c:1397: warning: right shift count >= width of type
      drivers/scsi/lpfc/lpfc_scsi.c:1397: warning: passing argument 1 of '__div64_32' from incompatible pointer type
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. @dorileo @torvalds

    tty: Update some of the USB kernel doc

    dorileo authored torvalds committed
    Updates some usb_serial_port members documentation.
    
    Signed-off-by: Leandro Dorileo <ldorileo@gmail.com>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @tbreeds @torvalds

    parport_pc: Fix build failure drivers/parport/parport_pc.c for powerpc

    tbreeds authored torvalds committed
    In commit 51dcdfe ("parport: Use the
    PCI IRQ if offered") parport_pc_probe_port() gained an irqflags arg.
    This isn't being supplied on powerpc.  This patch make powerpc fallback
    to the old behaviour, that is using "0" for irqflags.
    
    Fixes build failure:
    
      In file included from drivers/parport/parport_pc.c:68:
      arch/powerpc/include/asm/parport.h: In function 'parport_pc_find_nonpci_ports':
      arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
      arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
      arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
      make[3]: *** [drivers/parport/parport_pc.o] Error 1
    
    Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. @Alan-Cox @torvalds

    parport: Fix various uses of parport_pc

    Alan-Cox authored torvalds committed
    These got overlooked first time around.
    
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. @Alan-Cox @torvalds

    tty: Fix leak in ti-usb

    Alan-Cox authored torvalds committed
    If the ti-usb adapter returns an zero data length frame (which happens)
    then we leak a kref.  Found by Christoph Mair <christoph.mair@gmail.com>
    who proposed a patch.  The patch here is different as Christoph's patch
    didn't work for the case where tty = NULL and data arrived but Christoph
    did all the hard work chasing it down.
    
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. @Alan-Cox @torvalds

    cdc-acm: Fix long standing abuse of tty->low_latency

    Alan-Cox authored torvalds committed
    ACM sets the low latency flag but calls the flip buffer routines from
    IRQ context which isn't permitted (and as of 2.6.29 causes a warning
    hence this one was caught)
    
    Fortunatelt ACM doesn't need to set this flag in the first place as it
    only set it to work around problems in ancient (pre tty flip rewrite)
    kernels.
    
    Reported-by: Chuck Ebbert <cebbert@redhat.com>
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. @michalsimek

    microblaze: Add missing FILE tag to MAINTAINERS

    michalsimek authored
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  17. lockdep: warn about lockdep disabling after kernel taint, fix

    Ingo Molnar authored
    Impact: build fix for Sparc and s390
    
    Stephen Rothwell reported that the Sparc build broke:
    
     In file included from kernel/panic.c:12:
     include/linux/debug_locks.h: In function '__debug_locks_off':
     include/linux/debug_locks.h:15: error: implicit declaration of function 'xchg'
    
    due to:
    
     9eeba61: lockdep: warn about lockdep disabling after kernel taint
    
    There is some inconsistency between architectures about where exactly
    xchg() is defined.
    
    The traditional place is in system.h but the more logical point for it
    is in atomic.h - where most architectures (especially new ones) have
    it defined. These architecture also still offer it via system.h.
    
    Some, such as Sparc or s390 only have it in asm/system.h and not available
    via asm/atomic.h at all.
    
    Use the widest set of headers in debug_locks.h and also include asm/system.h.
    
    Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    LKML-Reference: <20090414144317.026498df.sfr@canb.auug.org.au>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  18. @michalsimek

    microblaze: remove duplicated #include's

    Huang Weiyi authored michalsimek committed
    Remove duplicated #include's in
      arch/microblaze/include/asm/io.h
      arch/microblaze/kernel/prom.c
      arch/microblaze/kernel/ptrace.c
      arch/microblaze/kernel/signal.c
      arch/microblaze/kernel/sys_microblaze.c
    
    Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  19. @michalsimek

    microblaze: struct device - replace bus_id with dev_name()

    michalsimek authored
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  20. @michalsimek

    microblaze: Simplify copy_thread()

    michalsimek authored
    Removing nr parameter from copy_tread function
    commit 6f2c55b
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  21. @michalsimek

    microblaze: Add TIMESTAMPING constants to socket.h

    michalsimek authored
    This changes was introduce with
    commit: cb9eff0
    
    net: new user space API for time stamping of incoming and outgoing packets
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  22. @michalsimek

    microblaze: Add missing empty ftrace.h file

    michalsimek authored
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  23. @michalsimek

    microblaze: Fix problem with removing zero length files

    michalsimek authored
    Adding one new line was recommended solution.
    Test with make distclean
    
    Tested-by: Jeff Garzik <jgarzik@redhat.com>
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  24. @pmundt

    sh: Add in PCI bus for DMA API debugging.

    pmundt authored
    This adds in the pci_bus_type for DMA API debug.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  25. @pmundt

    sh: Pre-allocate a reasonable number of DMA debug entries.

    pmundt authored
    This prevents the DMA API debugging from running out of entries right
    away on boot. Defines 4096 entries by default, which while a bit on the
    heavy side, ought to leave enough breathing room for some time.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  26. @torvalds

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

    torvalds authored
    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      tomoyo: version bump to 2.2.0.
      tomoyo: add Documentation/tomoyo.txt
  27. @torvalds

    Fix quilt merge error in acpi-cpufreq.c

    torvalds authored
    We ended up incorrectly using '&cur' instead of '&readin' in the
    work_on_cpu() -> smp_call_function_single() transformation in commit
    01599fc ("cpufreq: use
    smp_call_function_[single|many]() in acpi-cpufreq.c").
    
    Andrew explains:
     "OK, the acpi tree went and had conflicting changes merged into it after
      I'd written the patch and it appears that I incorrectly reverted part
      of 18b2646 while fixing the resulting
      rejects.
    
      Switching it to `readin' looks correct."
    
    Acked-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Apr 13, 2009
  1. tomoyo: version bump to 2.2.0.

    Tetsuo Handa authored James Morris committed
    Signed-off-by: Kentaro Takeda <takedakn@nttdata.co.jp>
    Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Signed-off-by: Toshiharu Harada <haradats@nttdata.co.jp>
    Signed-off-by: James Morris <jmorris@namei.org>
  2. tomoyo: add Documentation/tomoyo.txt

    Tetsuo Handa authored James Morris committed
    Signed-off-by: Kentaro Takeda <takedakn@nttdata.co.jp>
    Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Signed-off-by: Toshiharu Harada <haradats@nttdata.co.jp>
    Signed-off-by: James Morris <jmorris@namei.org>
  3. @torvalds

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

    torvalds authored
    …/kernel/git/jeremy/xen
    
    * 'for-rc1/xen/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
      xen: add FIX_TEXT_POKE to fixmap
      xen: honour VCPU availability on boot
      xen: clean up gate trap/interrupt constants
      xen: set _PAGE_NX in __supported_pte_mask before pagetable construction
      xen: resume interrupts before system devices.
      xen/mmu: weaken flush_tlb_other test
      xen/mmu: some early pagetable cleanups
      Xen: Add virt_to_pfn helper function
      x86-64: remove PGE from must-have feature list
      xen: mask XSAVE from cpuid
      NULL noise: arch/x86/xen/smp.c
      xen: remove xen_load_gdt debug
      xen: make xen_load_gdt simpler
      xen: clean up xen_load_gdt
      xen: split construction of p2m mfn tables from registration
      xen: separate p2m allocation from setting
      xen: disable preempt for leave_lazy_mmu
  4. @pmundt

    sh: sh7786: modify usb setup timeout judgment bug.

    Kuninori Morimoto authored pmundt committed
    This corrects a race with the PHY RST bit not being set properly if the
    PLL status changes right before timeout. This resulted in it potentially
    failing even if the device came up in time.
    
    Special thanks to Mr. Juha Leppanen and Iwamatsu-san for reporting this
    out and reviewing it.
    
    Reported-by: Juha Leppanen <juha_motorsportcom@luukku.com>
    Reviewed-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
    Tested-by: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  5. @torvalds

    edac: use to_delayed_work()

    Jean Delvare authored torvalds committed
    The edac-core driver includes code which assumes that the work_struct
    which is included in every delayed_work is the first member of that
    structure.  This is currently the case but might change in the future, so
    use to_delayed_work() instead, which doesn't make such an assumption.
    
    linux-2.6.30-rc1 has the to_delayed_work() function that will allow this
    patch to work
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    edac: fix local pci_write_bits32

    Jeff Haran authored torvalds committed
    Fix the edac local pci_write_bits32 to properly note the 'escape' mask if
    all ones in a 32-bit word.
    
    Currently no consumer of this function uses that mask, so there is no
    danger to existing code.
    
    Signed-off-by: Jeff Haran <jharan@Brocade.COM>
    Signed-off-by: Doug Thompson <dougthompson@xmission.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @torvalds

    sgi-xpc: clean up numerous globals

    Robin Holt authored torvalds committed
    Introduce xpc_arch_ops and eliminate numerous individual global definitions.
    
    Signed-off-by: Robin Holt <holt@sgi.com>
    Cc: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @torvalds

    sgi-xpc: implement opencomplete messaging

    Robin Holt authored torvalds committed
    sgi-xpc has a window of failure where an open message can be sent and a
    subsequent data message can get lost.  We have added a new message
    (opencomplete) which closes that window.
    
    Signed-off-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.