Commits on Sep 9, 2009
  1. @torvalds

    Linux 2.6.31

    torvalds committed Sep 9, 2009
  2. @ecashin

    aoe: allocate unused request_queue for sysfs

    Andy Whitcroft reported an oops in aoe triggered by use of an
    incorrectly initialised request_queue object:
    
      [ 2645.959090] kobject '<NULL>' (ffff880059ca22c0): tried to add
    		an uninitialized object, something is seriously wrong.
      [ 2645.959104] Pid: 6, comm: events/0 Not tainted 2.6.31-5-generic #24-Ubuntu
      [ 2645.959107] Call Trace:
      [ 2645.959139] [<ffffffff8126ca2f>] kobject_add+0x5f/0x70
      [ 2645.959151] [<ffffffff8125b4ab>] blk_register_queue+0x8b/0xf0
      [ 2645.959155] [<ffffffff8126043f>] add_disk+0x8f/0x160
      [ 2645.959161] [<ffffffffa01673c4>] aoeblk_gdalloc+0x164/0x1c0 [aoe]
    
    The request queue of an aoe device is not used but can be allocated in
    code that does not sleep.
    
    Bruno bisected this regression down to
    
      cd43e26
    
      block: Expose stacked device queues in sysfs
    
    "This seems to generate /sys/block/$device/queue and its contents for
     everyone who is using queues, not just for those queues that have a
     non-NULL queue->request_fn."
    
    Addresses http://bugs.launchpad.net/bugs/410198
    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13942
    
    Note that embedding a queue inside another object has always been
    an illegal construct, since the queues are reference counted and
    must persist until the last reference is dropped. So aoe was
    always buggy in this respect (Jens).
    
    Signed-off-by: Ed Cashin <ecashin@coraid.com>
    Cc: Andy Whitcroft <apw@canonical.com>
    Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
    Cc: Bruno Premont <bonbons@linux-vserver.org>
    Cc: Martin K. Petersen <martin.petersen@oracle.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
    ecashin committed with Jens Axboe Sep 9, 2009
  3. @torvalds

    i915: disable interrupts before tearing down GEM state

    Reinette Chatre reports a frozen system (with blinking keyboard LEDs)
    when switching from graphics mode to the text console, or when
    suspending (which does the same thing). With netconsole, the oops
    turned out to be
    
    	BUG: unable to handle kernel NULL pointer dereference at 0000000000000084
    	IP: [<ffffffffa03ecaab>] i915_driver_irq_handler+0x26b/0xd20 [i915]
    
    and it's due to the i915_gem.c code doing drm_irq_uninstall() after
    having done i915_gem_idle(). And the i915_gem_idle() path will do
    
      i915_gem_idle() ->
        i915_gem_cleanup_ringbuffer() ->
          i915_gem_cleanup_hws() ->
            dev_priv->hw_status_page = NULL;
    
    but if an i915 interrupt comes in after this stage, it may want to
    access that hw_status_page, and gets the above NULL pointer dereference.
    
    And since the NULL pointer dereference happens from within an interrupt,
    and with the screen still in graphics mode, the common end result is
    simply a silently hung machine.
    
    Fix it by simply uninstalling the irq handler before idling rather than
    after. Fixes
    
        http://bugzilla.kernel.org/show_bug.cgi?id=13819
    
    Reported-and-tested-by: Reinette Chatre <reinette.chatre@intel.com>
    Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Sep 8, 2009
Commits on Sep 8, 2009
  1. @torvalds

    drm/i915: fix mask bits setting

    eDP is exclusive connector too, and add missing crtc_mask
    setting for TV.
    
    This fixes
    
    	http://bugzilla.kernel.org/show_bug.cgi?id=14139
    
    Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
    Reported-and-tested-by: Carlos R. Mafra <crmafra2@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Zhenyu Wang committed with torvalds Sep 8, 2009
Commits on Sep 7, 2009
  1. @torvalds

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

    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: add LTE/GTE discard + rv515 two sided stencil register.
    torvalds committed Sep 7, 2009
  2. @torvalds

    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:
      IMA: update ima_counts_put
    torvalds committed Sep 7, 2009
  3. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      gianfar: Fix build.
    torvalds committed Sep 7, 2009
  4. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
      pcmcia: add CNF-CDROM-ID for ide
    torvalds committed Sep 7, 2009
  5. @torvalds

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

    …/git/anholt/drm-intel
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
      agp/intel: support for new chip variant of IGDNG mobile
      drm/i915: Unref old_obj on get_fence_reg() error path
      drm/i915: increase default latency constant (v2 w/comment)
    torvalds committed Sep 7, 2009
  6. drm/radeon/kms: add LTE/GTE discard + rv515 two sided stencil register.

    This adds some rv350+ register for LTE/GTE discard,
    and enables the rv515 two sided stencil register.
    It also disables the DEPTHXY_OFFSET register which
    can be used to workaround the CS checker.
    Moves rs690 to proper place in rs600 and uses correct
    table on rs600.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Sep 7, 2009
  7. IMA: update ima_counts_put

    - As ima_counts_put() may be called after the inode has been freed,
    verify that the inode is not NULL, before dereferencing it.
    
    - Maintain the IMA file counters in may_open() properly, decrementing
    any counter increments on subsequent errors.
    
    Reported-by: Ciprian Docan <docan@eden.rutgers.edu>
    Reported-by: J.R. Okajima <hooanon05@yahoo.co.jp>
    Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
    Acked-by: Eric Paris <eparis@redhat.com
    Signed-off-by: James Morris <jmorris@namei.org>
    Mimi Zohar committed with James Morris Sep 4, 2009
Commits on Sep 6, 2009
  1. @davem330

    gianfar: Fix build.

    Reported by Michael Guntsche <mike@it-loops.com>
    
    --------------------
    Commit
    38bddf0 gianfar: gfar_remove needs to call unregister_netdev()
    
    breaks the build of the gianfar driver because "dev" is undefined in
    this function. To quickly test rc9 I changed this to priv->ndev but I do
    not know if this is the correct one.
    --------------------
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Sep 6, 2009
Commits on Sep 5, 2009
  1. @torvalds

    Linux 2.6.31-rc9

    torvalds committed Sep 5, 2009
  2. @torvalds

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

    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: sbp2: fix freeing of unallocated memory
      firewire: ohci: fix Ricoh R5C832, video reception
      firewire: ohci: fix Agere FW643 and multiple cameras
      firewire: core: fix crash in iso resource management
    torvalds committed Sep 5, 2009
  3. @torvalds

    powerpc: Fix i8259 interrupt driver kernel crash on ML510

    This patch fixes a null pointer exception caused by removal of
    'ack()' for level interrupts in the Xilinx interrupt driver.  A recent
    change to the xilinx interrupt controller removed the ack hook for
    level irqs.
    
    Signed-off-by: Roderick Colenbrander <thunderbird2k@gmail.com>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Roderick Colenbrander committed with torvalds Sep 3, 2009
  4. @torvalds

    Merge git://git.infradead.org/~dwmw2/mtd-2.6.31

    * git://git.infradead.org/~dwmw2/mtd-2.6.31:
      JFFS2: add missing verify buffer allocation/deallocation
      mtd: nftl: fix offset alignments
      mtd: nftl: write support is broken
      mtd: m25p80: fix null pointer dereference bug
    torvalds committed Sep 5, 2009
  5. @torvalds

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      block: Allow changing max_sectors_kb above the default 512
    torvalds committed Sep 5, 2009
  6. @torvalds

    Merge branch 'fix/oxygen' of git://git.kernel.org/pub/scm/linux/kerne…

    …l/git/tiwai/sound-2.6
    
    * 'fix/oxygen' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      sound: oxygen: handle cards with missing EEPROM
      sound: oxygen: fix MCLK rate for 192 kHz playback
    torvalds committed Sep 5, 2009
  7. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      tc: Fix unitialized kernel memory leak
      pkt_sched: Revert tasklet_hrtimer changes.
      net: sk_free() should be allowed right after sk_alloc()
      gianfar: gfar_remove needs to call unregister_netdev()
      ipw2200: firmware DMA loading rework
    torvalds committed Sep 5, 2009
  8. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      crypto: skcipher - Fix skcipher_dequeue_givcrypt NULL test
    torvalds committed Sep 5, 2009
  9. @torvalds

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

    …/davej/cpufreq
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
      [CPUFREQ] Re-enable cpufreq suspend and resume code
    torvalds committed Sep 5, 2009
  10. @torvalds

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

    …it/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] fix csum_ipv6_magic()
      [IA64] Fix warning in dma-mapping.c
    torvalds committed Sep 5, 2009
  11. @torvalds

    Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

    * 'for-linus' of git://oss.sgi.com/xfs/xfs:
      xfs: actually enable the swapext compat handler
    torvalds committed Sep 5, 2009
  12. @torvalds

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

    …/git/ryusuke/nilfs2
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
      nilfs2: fix preempt count underflow in nilfs_btnode_prepare_change_key
    torvalds committed Sep 5, 2009
  13. @torvalds

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

    …/git/tj/percpu
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
      percpu: don't assume existence of cpu0
    torvalds committed Sep 5, 2009
  14. @torvalds

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

    …el/git/penberg/slab-2.6
    
    * 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
      slub: Fix kmem_cache_destroy() with SLAB_DESTROY_BY_RCU
    torvalds committed Sep 5, 2009
  15. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

    * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
      dm snapshot: fix on disk chunk size validation
      dm exception store: split set_chunk_size
      dm snapshot: fix header corruption race on invalidation
      dm snapshot: refactor zero_disk_area to use chunk_io
      dm log: userspace add luid to distinguish between concurrent log instances
      dm raid1: do not allow log_failure variable to unset after being set
      dm log: remove incorrect field from userspace table output
      dm log: fix userspace status output
      dm stripe: expose correct io hints
      dm table: add more context to terse warning messages
      dm table: fix queue_limit checking device iterator
      dm snapshot: implement iterate devices
      dm multipath: fix oops when request based io fails when no paths
    torvalds committed Sep 5, 2009
  16. @torvalds

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

    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI SR-IOV: correct broken resource alignment calculations
    torvalds committed Sep 5, 2009
  17. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Fix bootup with mcount in some configs.
      sparc64: Kill spurious NMI watchdog triggers by increasing limit to 30 seconds.
    torvalds committed Sep 5, 2009
  18. @torvalds

    Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/p…

    …ub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf_counter/powerpc: Fix cache event codes for POWER7
      perf_counter: Fix /0 bug in swcounters
      perf_counters: Increase paranoia level
    torvalds committed Sep 5, 2009
  19. @torvalds

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

    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: atkbd - add Compaq Presario R4000-series repeat quirk
      Input: i8042 - add Acer Aspire 5536 to the nomux list
    torvalds committed Sep 5, 2009
  20. @torvalds

    ext2: fix unbalanced kmap()/kunmap()

    In ext2_rename(), dir_page is acquired through ext2_dotdot().  It is
    then released through ext2_set_link() but only if old_dir != new_dir.
    Failing that, the pkmap reference count is never decremented and the
    page remains pinned forever.  Repeat that a couple times with highmem
    pages and all pkmap slots get exhausted, and every further kmap() calls
    end up stalling on the pkmap_map_wait queue at which point the whole
    system comes to a halt.
    
    Signed-off-by: Nicolas Pitre <nico@marvell.com>
    Acked-by: Theodore Ts'o <tytso@mit.edu>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Nicolas Pitre committed with torvalds Sep 5, 2009
  21. @torvalds

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

    …ernel/git/jlbec/ocfs2
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
      ocfs2: ocfs2_write_begin_nolock() should handle len=0
      ocfs2: invalidate dentry if its dentry_lock isn't initialized.
    torvalds committed Sep 5, 2009
  22. @torvalds

    pty: don't limit the writes to 'pty_space()' inside 'pty_write()'

    The whole write-room thing is something that is up to the _caller_ to
    worry about, not the pty layer itself.  The total buffer space will
    still be limited by the buffering routines themselves, so there is no
    advantage or need in having pty_write() artificially limit the size
    somehow.
    
    And what happened was that the caller (the n_tty line discipline, in
    this case) may have verified that there is room for 2 bytes to be
    written (for NL -> CRNL expansion), and it used to then do those writes
    as two single-byte writes.  And if the first byte written (CR) then
    caused a new tty buffer to be allocated, pty_space() may have returned
    zero when trying to write the second byte (LF), and then incorrectly
    failed the write - leading to a lost newline character.
    
    This should finally fix
    
    	http://bugzilla.kernel.org/show_bug.cgi?id=14015
    
    Reported-by: Mikael Pettersson <mikpe@it.uu.se>
    Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Sep 5, 2009
  23. @torvalds

    n_tty: do O_ONLCR translation as a single write

    When translating CR to CRNL in the n_tty line discipline, we did it as
    two tty_put_char() calls.  Which works, but is stupid, and has caused
    problems before too with bad interactions with the write_room() logic.
    The generic USB serial driver had that problem, for example.
    
    Now the pty layer had similar issues after being moved to the generic
    tty buffering code (in commit d945cb9:
    "pty: Rework the pty layer to use the normal buffering logic").
    
    So stop doing the silly separate two writes, and do it as a single write
    instead.  That's what the n_tty layer already does for the space
    expansion of tabs (XTABS), and it means that we'll now always have just
    a single write for the CRNL to match the single 'tty_write_room()' test,
    which hopefully means that the next time somebody screws up buffering,
    it won't cause weeks of debugging.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Sep 5, 2009