Permalink
Commits on May 6, 2012
  1. @torvalds

    Linux 3.4-rc6

    torvalds committed May 6, 2012
  2. @torvalds

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

    …inux/kernel/git/tip/tip
    
    Pull x86 fixes form Peter Anvin
    
    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
      arch/x86/platform/geode/net5501.c: change active_low to 0 for LED driver
      x86, relocs: Remove an unused variable
      asm-generic: Use __BITS_PER_LONG in statfs.h
      x86/amd: Re-enable CPU topology extensions in case BIOS has disabled it
    torvalds committed May 6, 2012
  3. @torvalds

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

    …/git/mason/linux-btrfs
    
    Pull btrfs fixes from Chris Mason:
     "The big ones here are a memory leak we introduced in rc1, and a
      scheduling while atomic if the transid on disk doesn't match the
      transid we expected.  This happens for corrupt blocks, or out of date
      disks.
    
      It also fixes up the ioctl definition for our ioctl to resolve logical
      inode numbers.  The __u32 was a merging error and doesn't match what
      we ship in the progs."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
      Btrfs: avoid sleeping in verify_parent_transid while atomic
      Btrfs: fix crash in scrub repair code when device is missing
      btrfs: Fix mismatching struct members in ioctl.h
      Btrfs: fix page leak when allocing extent buffers
      Btrfs: Add properly locking around add_root_to_dirty_list
    torvalds committed May 6, 2012
  4. @torvalds

    x86: fix broken TASK_SIZE for ia32_aout

    Setting TIF_IA32 in load_aout_binary() used to be enough; these days
    TASK_SIZE is controlled by TIF_ADDR32 and that one doesn't get set
    there.  Switch to use of set_personality_ia32()...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Al Viro committed with torvalds May 6, 2012
  5. @chrismason-xx

    Btrfs: avoid sleeping in verify_parent_transid while atomic

    verify_parent_transid needs to lock the extent range to make
    sure no IO is underway, and so it can safely clear the
    uptodate bits if our checks fail.
    
    But, a few callers are using it with spinlocks held.  Most
    of the time, the generation numbers are going to match, and
    we don't want to switch to a blocking lock just for the error
    case.  This adds an atomic flag to verify_parent_transid,
    and changes it to return EAGAIN if it needs to block to
    properly verifiy things.
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    chrismason-xx committed May 6, 2012
Commits on May 5, 2012
  1. @torvalds

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

    …/git/mattst88/alpha
    
    Pull alpha fixes from Matt Turner:
     "My alpha tree is back up (after taking quite some time to get my GPG
      key signed).  It contains just some simple fixes."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
      alpha: silence 'const' warning in sys_marvel.c
      alpha: include module.h to fix modpost on Tsunami
      alpha: properly define get/set_rtc_time on Marvel/SMP
      alpha: VGA_HOSE depends on VGA_CONSOLE
    torvalds committed May 5, 2012
  2. @torvalds

    TTY: pdc_cons, fix regression in close

    The test in pdc_console_tty_close '!tty->count' was always wrong
    because tty->count is decremented after tty->ops->close is called and
    thus can never be zero. Hence the 'then' branch was never executed and
    the timer never deleted.
    
    This did not matter until commit 5dd5bc4 ("TTY: pdc_cons, use
    tty_port").  There we needed to set TTY in tty_port to NULL, but this
    never happened due to the bug above.
    
    So change the test to really trigger at the last close by changing the
    condition to 'tty->count == 1'.
    
    Well, the driver should not touch tty->count at all.  It should use
    tty_port->count and count open count there itself.
    
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Reported-and-tested-by: Mikulas Patocka <mpatocka@redhat.com>
    Cc: Kyle McMartin <kyle@mcmartin.ca>
    Cc: Helge Deller <deller@gmx.de>
    Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Jiri Slaby committed with torvalds May 5, 2012
  3. @torvalds

    Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    …t/tiwai/sound
    
    Pull sound sound fixes from Takashi Iwai:
     "As good as nothing exciting here; just a few trivial fixes for various
      ASoC stuff."
    
    * tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
      ASoC: omap-pcm: Free dma buffers in case of error.
      ASoC: s3c2412-i2s: Fix dai registration
      ASoC: wm8350: Don't use locally allocated codec struct
      ASoC: tlv312aic23: unbreak resume
      ASoC: bf5xx-ssm2602: Set DAI format
      ASoC: core: check of_property_count_strings failure
      ASoC: dt: sgtl5000.txt: Add description for 'reg' field
      ASoC: wm_hubs: Make sure we don't disable differential line outputs
    torvalds committed May 5, 2012
  4. @torvalds

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

    …it/lenb/linux
    
    Pull an ACPI patch from Len Brown:
     "It fixes a D3 issue new in 3.4-rc1."
    
    By Lin Ming via Len Brown:
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
      ACPI: Fix D3hot v D3cold confusion
    torvalds committed May 5, 2012
  5. @sashalevin @torvalds

    init: don't try mounting device as nfs root unless type fully matches

    Currently, we'll try mounting any device who's major device number is
    UNNAMED_MAJOR as NFS root.  This would happen for non-NFS devices as
    well (such as 9p devices) but it wouldn't cause any issues since
    mounting the device as NFS would fail quickly and the code proceeded to
    doing the proper mount:
    
           [  101.522716] VFS: Unable to mount root fs via NFS, trying floppy.
           [  101.534499] VFS: Mounted root (9p filesystem) on device 0:18.
    
    Commit 6829a048102a ("NFS: Retry mounting NFSROOT") introduced retries
    when mounting NFS root, which means that now we don't immediately fail
    and instead it takes an additional 90+ seconds until we stop retrying,
    which has revealed the issue this patch fixes.
    
    This meant that it would take an additional 90 seconds to boot when
    we're not using a device type which gets detected in order before NFS.
    
    This patch modifies the NFS type check to require device type to be
    'Root_NFS' instead of requiring the device to have an UNNAMED_MAJOR
    major.  This makes boot process cleaner since we now won't go through
    the NFS mounting code at all when the device isn't an NFS root
    ("/dev/nfs").
    
    Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    sashalevin committed with torvalds May 5, 2012
  6. @tiwai
  7. @tiwai

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

    …it/lrg/asoc into fix/asoc
    tiwai committed May 5, 2012
  8. @tiwai

    Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/broonie/sound into for-linus
    
    ASoC: Updates for 3.4
    
    Nothing terribly exciting here, a bunch of small and simple fixes
    scattered around the place.
    tiwai committed May 5, 2012
  9. @lenb

    ACPI: Fix D3hot v D3cold confusion

    Before this patch, ACPI_STATE_D3 incorrectly referenced D3hot
    in some places, but D3cold in other places.
    
    After this patch, ACPI_STATE_D3 always means ACPI_STATE_D3_COLD;
    and all references to D3hot use ACPI_STATE_D3_HOT.
    
    ACPI's _PR3 method is used to enter both D3hot and D3cold states.
    What distinguishes D3hot from D3cold is the presence _PR3
    (Power Resources for D3hot)  If these resources are all ON,
    then the state is D3hot.  If _PR3 is not present,
    or all _PR0 resources for the devices are OFF,
    then the state is D3cold.
    
    This patch applies after Linux-3.4-rc1.
    A future syntax cleanup may remove ACPI_STATE_D3
    to emphasize that it always means ACPI_STATE_D3_COLD.
    
    Signed-off-by: Lin Ming <ming.m.lin@intel.com>
    Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
    Reviewed-by: Aaron Lu <aaron.lu@amd.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Lin Ming committed with lenb Apr 23, 2012
  10. @gregkh @torvalds

    hfsplus: Fix potential buffer overflows

    Commit ec81aec ("hfs: fix a potential buffer overflow") fixed a few
    potential buffer overflows in the hfs filesystem.  But as Timo Warns
    pointed out, these changes also need to be made on the hfsplus
    filesystem as well.
    
    Reported-by: Timo Warns <warns@pre-sense.de>
    Acked-by: WANG Cong <amwang@redhat.com>
    Cc: Alexey Khoroshilov <khoroshilov@ispras.ru>
    Cc: Miklos Szeredi <mszeredi@suse.cz>
    Cc: Sage Weil <sage@newdream.net>
    Cc: Eugene Teo <eteo@redhat.com>
    Cc: Roman Zippel <zippel@linux-m68k.org>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: Alexey Dobriyan <adobriyan@gmail.com>
    Cc: Dave Anderson <anderson@redhat.com>
    Cc: stable <stable@vger.kernel.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    gregkh committed with torvalds May 4, 2012
Commits on May 4, 2012
  1. @torvalds

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

    …m/linux/kernel/git/tip/tip
    
    Pull timer fix from Thomas Gleixner.
    
    * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      rtc: Fix possible null pointer dereference in rtc-mpc5121.c
    torvalds committed May 4, 2012
  2. @torvalds

    Merge git://git.samba.org/sfrench/cifs-2.6

    Pull CIFS fixes from Steve French.
    
    * git://git.samba.org/sfrench/cifs-2.6:
      fs/cifs: fix parsing of dfs referrals
      cifs: make sure we ignore the credentials= and cred= options
      [CIFS] Update cifs version to 1.78
      cifs - check S_AUTOMOUNT in revalidate
      cifs: add missing initialization of server->req_lock
      cifs: don't cap ra_pages at the same level as default_backing_dev_info
      CIFS: Fix indentation in cifs_show_options
    torvalds committed May 4, 2012
  3. @kernelslacker @torvalds

    CPU frequency drivers MAINTAINERS update

    Remove myself as cpufreq maintainer.
    x86 driver changes can go through the regular x86/ACPI trees.
    ARM driver changes through the ARM trees.
    cpufreq core changes are rare these days, and can just go to lkml/direct.
    
    Signed-off-by: Dave Jones <davej@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    kernelslacker committed with torvalds May 4, 2012
  4. @torvalds

    seqlock: add 'raw_seqcount_begin()' function

    The normal read_seqcount_begin() function will wait for any current
    writers to exit their critical region by looping until the sequence
    count is even.
    
    That "wait for sequence count to stabilize" is the right thing to do if
    the read-locker will just retry the whole operation on contention: no
    point in doing a potentially expensive reader sequence if we know at the
    beginning that we'll just end up re-doing it all.
    
    HOWEVER.  Some users don't actually retry the operation, but instead
    will abort and do the operation with proper locking.  So the sequence
    count case may be the optimistic quick case, but in the presense of
    writers you may want to do full locking in order to guarantee forward
    progress.  The prime example of this would be the RCU name lookup.
    
    And in that case, you may well be better off without the "retry early",
    and are in a rush to instead get to the failure handling.  Thus this
    "raw" interface that just returns the sequence number without testing it
    - it just forces the low bit to zero so that read_seqcount_retry() will
    always fail such a "active concurrent writer" scenario.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed May 4, 2012
  5. @torvalds

    Fix __read_seqcount_begin() to use ACCESS_ONCE for sequence value read

    We really need to use a ACCESS_ONCE() on the sequence value read in
    __read_seqcount_begin(), because otherwise the compiler might end up
    reloading the value in between the test and the return of it.  As a
    result, it might end up returning an odd value (which means that a write
    is in progress).
    
    If the reader is then fast enough that that odd value is still the
    current one when the read_seqcount_retry() is done, we might end up with
    a "successful" read sequence, even despite the concurrent write being
    active.
    
    In practice this probably never really happens - there just isn't
    anything else going on around the read of the sequence count, and the
    common case is that we end up having a read barrier immediately
    afterwards.
    
    So the code sequence in which gcc might decide to reaload from memory is
    small, and there's no reason to believe it would ever actually do the
    reload.  But if the compiler ever were to decide to do so, it would be
    incredibly annoying to debug.  Let's just make sure.
    
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed May 4, 2012
  6. @ywang29

    intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND

    So that the power button still wakes up the platform.
    
    Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
    Link: http://lkml.kernel.org/r/20120504210244.F2EA5A018B@akpm.mtv.corp.google.com
    Tested-by: Kangkai Yin <kangkai.yin@intel.com>
    Tested-by: Yong Wang <yong.y.wang@intel.com>
    Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Cc: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    ywang29 committed with H. Peter Anvin May 4, 2012
  7. arch/x86/platform/geode/net5501.c: change active_low to 0 for LED driver

    It seems that there was an error with the active_low = 1 for the
    LED, since it should be set to 0 (meaning that active is high,
    since 0 is false, hence the confusion.
    
    The wiki article about it confuses it, since it contradicts itself,
    regarding what turns on the LED.
    
    I have tested 3.4-rc2 on my net5501 with this patch, and it makes the LED
    behave correctly, where "none" turns it off, and "default-on" turns it on,
    when echoed onto the trigger "file" in /sys/class/leds.
    
    Signed-off-by: Bjarke Istrup Pedersen <gurligebis@gentoo.org>
    Link: http://lkml.kernel.org/r/20120504210146.62186A018B@akpm.mtv.corp.google.com
    Cc: Philip Prindeville <philipp@redfish-solutions.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Bjarke Istrup Pedersen committed with H. Peter Anvin May 4, 2012
  8. @chrismason-xx

    Btrfs: fix crash in scrub repair code when device is missing

    Fix that when scrub tries to repair an I/O or checksum error and one of
    the devices containing the mirror is missing, it crashes in bio_add_page
    because the bdev is a NULL pointer for missing devices.
    
    Reported-by: Marco L. Crociani <marco.crociani@gmail.com>
    Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    Stefan Behrens committed with chrismason-xx May 4, 2012
  9. @chrismason-xx

    btrfs: Fix mismatching struct members in ioctl.h

    Fix the size members of btrfs_ioctl_ino_path_args and
    btrfs_ioctl_logical_ino_args. The user space btrfs-progs utilities used
    __u64 and the kernel headers used __u32 before.
    
    Signed-off-by: Alexander Block <ablock84@googlemail.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    Alexander Block committed with chrismason-xx May 4, 2012
  10. @chrismason-xx

    Btrfs: fix page leak when allocing extent buffers

    If we happen to alloc a extent buffer and then alloc a page and notice that
    page is already attached to an extent buffer, we will only unlock it and
    free our existing eb.  Any pages currently attached to that eb will be
    properly freed, but we don't do the page_cache_release() on the page where
    we noticed the other extent buffer which can cause us to leak pages and I
    hope cause the weird issues we've been seeing in this area.  Thanks,
    
    Signed-off-by: Josef Bacik <josef@redhat.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    Josef Bacik committed with chrismason-xx May 4, 2012
  11. @chrismason-xx

    Btrfs: Add properly locking around add_root_to_dirty_list

    add_root_to_dirty_list happens once at the very beginning of the
    transaction, but it is still racey.
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    chrismason-xx committed May 3, 2012
  12. @torvalds

    Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    Pull drm fixes from Dave Airlie:
     "Some minor fixes from Intel and a radeon fix.
    
      I have the nouveau fix for the i2c regression queued for next week,
      its mostly a revert and seems to work on the system it was originally
      introduced for thanks to some i2c core changes."
    
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm/radeon: clarify and extend wb setup on APUs and NI+ asics
      drm/i915: enable dip before writing data on gen4
      fixing dmi match for hp t5745 and hp st5747 thin client
      drm/i915: Only enable IPS polling for gen5
      drm/i915: Do not read non-existent DPLL registers on PCH hardware
    torvalds committed May 4, 2012
  13. @torvalds

    Merge tag 'md-3.4-fixes' of git://neil.brown.name/md

    Pull one small fix for md/bitmaps from NeilBrown:
     "This fixes a regression that was introduced in the merge window."
    
    * tag 'md-3.4-fixes' of git://neil.brown.name/md:
      md/bitmap: fix calculation of 'chunks' - missing shift.
    torvalds committed May 4, 2012
  14. @torvalds

    Merge branch 'fix-unmapped-word-at-a-time'

    Jana Saout confirmed that this fixes the page faults he saw.
    
    His problem was triggered by ocfs2 and autofs symlink lookups, where the
    symlink allocation was at the end of a page.  But the deeper reason
    seems to be the use of Xen-PV, which is what then causes him to have all
    these unmapped pages, which is what then makes it a problem when the
    unaligned word-at-a-time code fetches data past the end of a page.
    
    * fix-unmapped-word-at-a-time:
      vfs: make word-at-a-time accesses handle a non-existing page
    torvalds committed May 4, 2012
  15. @lrg-ti

    ASoC: omap-pcm: Free dma buffers in case of error.

    Signed-off-by: Oleg Matcovschi <oleg.matcovschi@ti.com>
    Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
    Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@ti.com>
    Oleg Matcovschi committed with lrg-ti Apr 25, 2012
  16. drm/radeon: clarify and extend wb setup on APUs and NI+ asics

    Use family rather than DCE check for clarity, also always use
    wb on APUs, there will never be AGP variants.
    
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with Dave Airlie May 3, 2012
  17. @neilbrown

    md/bitmap: fix calculation of 'chunks' - missing shift.

    commit 61a0d80 "md/bitmap: discard CHUNK_BLOCK_SHIFT macro"
    replaced CHUNK_BLOCK_RATIO() by the same text that was
    replacing CHUNK_BLOCK_SHIFT() - which is clearly wrong.
    
    The result is that 'chunks' is often too small by 1,
    which can sometimes result in a crash (not sure how).
    
    So use the correct replacement, and get rid of CHUNK_BLOCK_RATIO
    which is no longe used.
    
    Reported-by: Karl Newman <siliconfiend@gmail.com>
    Tested-by: Karl Newman <siliconfiend@gmail.com>
    Signed-off-by: NeilBrown <neilb@suse.de>
    neilbrown committed May 4, 2012
  18. @metze-samba

    fs/cifs: fix parsing of dfs referrals

    The problem was that the first referral was parsed more than once
    and so the caller tried the same referrals multiple times.
    
    The problem was introduced partly by commit
    066ce68,
    where 'ref += le16_to_cpu(ref->Size);' got lost,
    but that was also wrong...
    
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Tested-by: Björn Jacke <bj@sernet.de>
    Reviewed-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>
    metze-samba committed with Steve French May 3, 2012
  19. @torvalds

    Merge tag 'mfd-for-linus-3.4-rc6' of git://git.kernel.org/pub/scm/lin…

    …ux/kernel/git/sameo/mfd-2.6
    
    Pull second set of MFD fixes from Samuel Ortiz:
     "This time we only have a one liner fixing an omap-usb build error."
    
    * tag 'mfd-for-linus-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
      mfd: Fix build breakage in omap-usb-host.c
    torvalds committed May 4, 2012
  20. @torvalds

    Merge branch 'efi-vars' from Matthew Garrett

    * efi-vars:
      efivars: Improve variable validation
    torvalds committed May 4, 2012