Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
tag: v3.0-rc2
Commits on Jun 6, 2011
  1. @torvalds

    Linux 3.0-rc2

    torvalds authored
  2. @torvalds

    mm: fix ENOSPC returned by handle_mm_fault()

    Hugh Dickins authored torvalds committed
    Al Viro observes that in the hugetlb case, handle_mm_fault() may return
    a value of the kind ENOSPC when its caller is expecting a value of the
    kind VM_FAULT_SIGBUS: fix alloc_huge_page()'s failure returns.
    
    Signed-off-by: Hugh Dickins <hughd@google.com>
    Acked-by: Al Viro <viro@zeniv.linux.org.uk>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @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:
      ALSA: usb - turn off de-emphasis in s/pdif for cm6206
      ALSA: asihpi: Use angle brackets for system includes
      ALSA: fm801: add error handling if auto-detect fails
      ALSA: hda - Check pin support EAPD in ad198x_power_eapd_write
      ALSA: hda - Fix HP and Front pins of ad1988/ad1989 in ad198x_power_eapd()
      ALSA: 6fire: Don't leak firmware in error path
      ASoC: Fix wm_hubs input PGA ZC bits
      ASoC: Fix dapm_is_shared_kcontrol so everything isn't shared
  4. @torvalds

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

    torvalds authored
    …kernel/git/groeck/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
      hwmon: (max6642): Better chip detection schema
      hwmon: (coretemp) Further relax temperature range checks
      hwmon: (coretemp) Fix TjMax detection for older CPUs
      hwmon: (coretemp) Relax target temperature range check
      hwmon: (max6642) Rename temp_fault sysfs attribute to temp2_fault
  5. @tiwai
Commits on Jun 4, 2011
  1. @torvalds

    Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

    torvalds authored
    * 'for-linus' of git://android.git.kernel.org/kernel/tegra:
      ARM: Tegra: Harmony: Fix conflicting GPIO numbering
  2. @swarren @colincross

    ARM: Tegra: Harmony: Fix conflicting GPIO numbering

    swarren authored colincross committed
    Currently, both the WM8903 and TPS6586x chips attempt to register with
    gpiolib using the same GPIO numbers. This causes the audio driver to
    fail to initialize.
    
    To solve this, add a define to board-harmony.h for the TPS6586x, and make
    board-harmony-power.c use this define, instead of directly referencing
    TEGRA_NR_GPIOS.
    
    This fixes a regression introduced by commit
    6f168f2.
    ARM: tegra: harmony: initialize the TPS65862 PMIC
    
    Signed-off-by: Stephen Warren <swarren@nvidia.com>
    Signed-off-by: Colin Cross <ccross@android.com>
  3. @torvalds

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

    torvalds authored
    …/git/mason/btrfs-unstable
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (25 commits)
      btrfs: fix uninitialized variable warning
      btrfs: add helper for fs_info->closing
      Btrfs: add mount -o inode_cache
      btrfs: scrub: add explicit plugging
      btrfs: use btrfs_ino to access inode number
      Btrfs: don't save the inode cache if we are deleting this root
      btrfs: false BUG_ON when degraded
      Btrfs: don't save the inode cache in non-FS roots
      Btrfs: make sure we don't overflow the free space cache crc page
      Btrfs: fix uninit variable in the delayed inode code
      btrfs: scrub: don't reuse bios and pages
      Btrfs: leave spinning on lookup and map the leaf
      Btrfs: check for duplicate entries in the free space cache
      Btrfs: don't try to allocate from a block group that doesn't have enough space
      Btrfs: don't always do readahead
      Btrfs: try not to sleep as much when doing slow caching
      Btrfs: kill BTRFS_I(inode)->block_group
      Btrfs: don't look at the extent buffer level 3 times in a row
      Btrfs: map the node block when looking for readahead targets
      Btrfs: set range_start to the right start in count_range_bits
      ...
  4. @perdalen

    hwmon: (max6642): Better chip detection schema

    perdalen authored Guenter Roeck committed
    Improve detection of MAX6642 by reading non existing registers (0x04, 0x06
    and 0xff). Reading those registers returns the previously read value.
    
    Signed-off-by: Per Dalen <per.dalen@appeartv.com>
    [guenter.roeck@ericsson.com: added second set of register reads]
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
  5. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixe…

    torvalds authored
    …s-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] Fix oops caused by queue refcounting failure
  6. @torvalds

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

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (40 commits)
      tg3: Fix tg3_skb_error_unmap()
      net: tracepoint of net_dev_xmit sees freed skb and causes panic
      drivers/net/can/flexcan.c: add missing clk_put
      net: dm9000: Get the chip in a known good state before enabling interrupts
      drivers/net/davinci_emac.c: add missing clk_put
      af-packet: Add flag to distinguish VID 0 from no-vlan.
      caif: Fix race when conditionally taking rtnl lock
      usbnet/cdc_ncm: add missing .reset_resume hook
      vlan: fix typo in vlan_dev_hard_start_xmit()
      net/ipv4: Check for mistakenly passed in non-IPv4 address
      iwl4965: correctly validate temperature value
      bluetooth l2cap: fix locking in l2cap_global_chan_by_psm
      ath9k: fix two more bugs in tx power
      cfg80211: don't drop p2p probe responses
      Revert "net: fix section mismatches"
      drivers/net/usb/catc.c: Fix potential deadlock in catc_ctrl_run()
      sctp: stop pending timers and purge queues when peer restart asoc
      drivers/net: ks8842 Fix crash on received packet when in PIO mode.
      ip_options_compile: properly handle unaligned pointer
      iwlagn: fix incorrect PCI subsystem id for 6150 devices
      ...
  7. @chrismason-xx

    btrfs: fix uninitialized variable warning

    David Sterba authored chrismason-xx committed
    With Linus' tree, today's linux-next build (powercp ppc64_defconfig)
    produced this warning:
    
    fs/btrfs/delayed-inode.c: In function 'btrfs_delayed_update_inode':
    fs/btrfs/delayed-inode.c:1598:6: warning: 'ret' may be used
    uninitialized in this function
    
    Introduced by commit 16cdcec ("btrfs: implement delayed inode items
    operation").
    
    This fixes a bug in btrfs_update_inode(): if the returned value from
    btrfs_delayed_update_inode is a nonzero garbage, inode stat data are not
    updated and several call paths may hit a BUG_ON or fail with strange
    code.
    
    Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: David Sterba <dsterba@suse.cz>
  8. @chrismason-xx

    btrfs: add helper for fs_info->closing

    David Sterba authored chrismason-xx committed
    wrap checking of filesystem 'closing' flag and fix a few missing memory
    barriers.
    
    Signed-off-by: David Sterba <dsterba@suse.cz>
  9. @chrismason-xx

    Btrfs: add mount -o inode_cache

    chrismason-xx authored
    This makes the inode map cache default to off until we
    fix the overflow problem when the free space crcs don't fit
    inside a single page.
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  10. @chrismason-xx

    btrfs: scrub: add explicit plugging

    Arne Jansen authored chrismason-xx committed
    With the removal of the implicit plugging scrub ends up doing more and
    smaller I/O than necessary. This patch adds explicit plugging per chunk.
    
    Signed-off-by: Arne Jansen <sensille@gmx.net>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  11. @chrismason-xx

    btrfs: use btrfs_ino to access inode number

    David Sterba authored chrismason-xx committed
    commit 4cb5300 ("Btrfs: add mount -o auto_defrag") accesses inode
    number directly while it should use the helper with the new inode
    number allocator.
    
    Signed-off-by: David Sterba <dsterba@suse.cz>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  12. @chrismason-xx

    Btrfs: don't save the inode cache if we are deleting this root

    Josef Bacik authored chrismason-xx committed
    With xfstest 254 I can panic the box every time with the inode number caching
    stuff on.  This is because we clean the inodes out when we delete the subvolume,
    but then we write out the inode cache which adds an inode to the subvolume inode
    tree, and then when it gets evicted again the root gets added back on the dead
    roots list and is deleted again, so we have a double free.  To stop this from
    happening just return 0 if refs is 0 (and we're not the tree root since tree
    root always has refs of 0).  With this fix 254 no longer panics.  Thanks,
    
    Signed-off-by: Josef Bacik <josef@redhat.com>
    Tested-by: David Sterba <dsterba@suse.cz>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  13. @chrismason-xx

    btrfs: false BUG_ON when degraded

    Arne Jansen authored chrismason-xx committed
    In degraded mode the struct btrfs_device of missing devs don't have
    device->name set. A kstrdup of NULL correctly returns NULL. Don't
    BUG in this case.
    
    Signed-off-by: Arne Jansen <sensille@gmx.net>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  14. @liub @chrismason-xx

    Btrfs: don't save the inode cache in non-FS roots

    liub authored chrismason-xx committed
    This adds extra checks to make sure the inode map we are caching really
    belongs to a FS root instead of a special relocation tree.  It
    prevents crashes during balancing operations.
    
    Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  15. @chrismason-xx

    Btrfs: make sure we don't overflow the free space cache crc page

    chrismason-xx authored
    The free space cache uses only one page for crcs right now,
    which means we can't have a cache file bigger than the
    crcs we can fit in the first page.  This adds a check to
    enforce that restriction.
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  16. @chrismason-xx

    Btrfs: fix uninit variable in the delayed inode code

    chrismason-xx authored
    The nitems counter needs to start at zero
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  17. @chrismason-xx

    btrfs: scrub: don't reuse bios and pages

    Arne Jansen authored chrismason-xx committed
    The current scrub implementation reuses bios and pages as often as possible,
    allocating them only on start and releasing them when finished. This leads
    to more problems with the block layer than it's worth. The elevator gets
    confused when there are more pages added to the bio than bi_size suggests.
    This patch completely rips out the reuse of bios and pages and allocates
    them freshly for each submit.
    
    Signed-off-by: Arne Jansen <sensille@gmx.net>
    Signed-off-by: Chris Maosn <chris.mason@oracle.com>
Commits on Jun 3, 2011
  1. @torvalds

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

    torvalds authored
    * 'for-linus' of git://git.kernel.dk/linux-block:
      block: Use hlist_entry() for io_context.cic_list.first
      cfq-iosched: Remove bogus check in queue_fail path
      xen/blkback: potential null dereference in error handling
      xen/blkback: don't call vbd_size() if bd_disk is NULL
      block: blkdev_get() should access ->bd_disk only after success
      CFQ: Fix typo and remove unnecessary semicolon
      block: remove unwanted semicolons
      Revert "block: Remove extra discard_alignment from hd_struct."
      nbd: adjust 'max_part' according to part_shift
      nbd: limit module parameters to a sane value
      nbd: pass MSG_* flags to kernel_recvmsg()
      block: improve the bio_add_page() and bio_add_pc_page() descriptions
  2. @torvalds

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

    torvalds authored
    …/git/vapier/blackfin
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
      Blackfin: strncpy: fix handling of zero lengths
  3. @torvalds

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

    torvalds authored
    …t/cmetcalf/linux-tile
    
    * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
      asm-generic/unistd.h: support sendmmsg syscall
      tile: enable CONFIG_BUGVERBOSE
  4. @torvalds

    Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

    torvalds authored
    * 'linux-next' of git://git.infradead.org/ubifs-2.6:
      UBIFS: fix-up free space earlier
      UBIFS: intialize LPT earlier
      UBIFS: assert no fixup when writing a node
      UBIFS: fix clean znode counter corruption in error cases
      UBIFS: fix memory leak on error path
      UBIFS: fix shrinker object count reports
      UBIFS: fix recovery broken by the previous recovery fix
      UBIFS: amend ubifs_recover_leb interface
      UBIFS: introduce a "grouped" journal head flag
      UBIFS: supress false error messages
  5. @torvalds

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

    torvalds authored
    …/git/rostedt/linux-2.6-ktest
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest:
      ktest: Ignore unset values of the minconfig in config_bisect
      ktest: Fix result of rebooting the kernel
      ktest: Fix off-by-one in config bisect result
  6. @torvalds

    Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/sc…

    torvalds authored
    …m/linux/kernel/git/lethal/sh-2.6
    
    * 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      ARM: mach-shmobile: add DMAC clock definitions on SH7372
      ARM: arch-shmobile: support SDHI card detection on mackerel, using a GPIO
      sh_mobile_meram: MERAM platform data for LCDC
  7. @torvalds

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

    torvalds authored
    …ux/kernel/git/lethal/sh-2.6
    
    * 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      dmaengine: shdma: fix a regression: initialise DMA channels for memcpy
      dmaengine: shdma: Fix up fallout from runtime PM changes.
      Revert "clocksource: sh_cmt: Runtime PM support"
      Revert "clocksource: sh_tmu: Runtime PM support"
      sh: Fix up asm-generic/ptrace.h fallout.
      sh64: Move from P1SEG to CAC_ADDR for consistent sync.
      sh64: asm/pgtable.h needs asm/mmu.h
      sh: asm/tlb.h needs linux/swap.h
      sh: mark DMA slave ID 0 as invalid
      sh: Update shmin to reflect PIO dependency.
      sh: arch/sh/kernel/process_32.c needs linux/prefetch.h.
      sh: add MMCIF runtime PM support on ecovec
      sh: switch ap325rxa to dynamically manage the platform camera
  8. @torvalds

    Revert "ASoC: Update cx20442 for TTY API change"

    torvalds authored
    This reverts commit ed0bd23.
    
    Since we reverted the TTY API change, we should revert the ASoC update
    to it too.
    
    Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Cc: Liam Girdwood <lrg@ti.com>
    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @torvalds

    Revert "tty: make receive_buf() return the amout of bytes received"

    torvalds authored
    This reverts commit b1c43f8.
    
    It was broken in so many ways, and results in random odd pty issues.
    
    It re-introduced the buggy schedule_work() in flush_to_ldisc() that can
    cause endless work-loops (see commit a5660b4: "tty: fix endless
    work loop when the buffer fills up").
    
    It also used an "unsigned int" return value fo the ->receive_buf()
    function, but then made multiple functions return a negative error code,
    and didn't actually check for the error in the caller.
    
    And it didn't actually work at all.  BenH bisected down odd tty behavior
    to it:
      "It looks like the patch is causing some major malfunctions of the X
       server for me, possibly related to PTYs.  For example, cat'ing a
       large file in a gnome terminal hangs the kernel for -minutes- in a
       loop of what looks like flush_to_ldisc/workqueue code, (some ftrace
       data in the quoted bits further down).
    
       ...
    
       Some more data: It -looks- like what happens is that the
       flush_to_ldisc work queue entry constantly re-queues itself (because
       the PTY is full ?) and the workqueue thread will basically loop
       forver calling it without ever scheduling, thus starving the consumer
       process that could have emptied the PTY."
    
    which is pretty much exactly the problem we fixed in a5660b4.
    
    Milton Miller pointed out the 'unsigned int' issue.
    
    Reported-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Reported-by: Milton Miller <miltonm@bga.com>
    Cc: Stefan Bigler <stefan.bigler@keymile.com>
    Cc: Toby Gray <toby.gray@realvnc.com>
    Cc: Felipe Balbi <balbi@ti.com>
    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. @linvjw

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

    linvjw authored
    …t/linville/wireless-2.6 into for-davem
  11. @tiwai

    ALSA: usb - turn off de-emphasis in s/pdif for cm6206

    Eric Lammerts authored tiwai committed
    CM6206: Turn off de-emphasis channel status bit in S/PDIF output.
    
    Signed-off-by: Eric Lammerts <eric@lammerts.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  12. @BenGardiner

    UBIFS: fix-up free space earlier

    BenGardiner authored Artem Bityutskiy committed
    The free space fixup is currently initiated during mount after the call to
    ubifs_write_master() which results in a write to PEBs; this has been observed
    with the patch 'assert no fixup when writing a node' applied:
    
    Move the free space fixup on mount to before the calls to
    ubifs_recover_inl_heads() and ubifs_write_master(). This results in no
    assertions with the previously mentioned patch applied.
    
    Artem: tweaked the patch a bit
    
    Signed-off-by: Ben Gardiner <bengardiner@nanometrics>
    Reviewed-by: Matthew L. Creech <mlcreech@gmail.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
  13. @BenGardiner

    UBIFS: intialize LPT earlier

    BenGardiner authored Artem Bityutskiy committed
    The current 'mount_ubifs()' implementation does not initialize the LPT until the
    the master node is marked dirty. Move the LPT initialization to before marking
    the master node dirty. This is a preparation for the next patch which will move
    the free-space-fixup check to before marking the master node dirty, because we
    have to fix-up the free space before doing any writes.
    
    Artem: massaged the patch and commit message.
    
    Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
    Reviewed-by: Matthew L. Creech <mlcreech@gmail.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Something went wrong with that request. Please try again.