Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Apr 18, 2012
  1. @torvalds

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

    torvalds authored
    …/git/jmorris/linux-security
    
    Pull security subsystem fixes from James Morris.
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
      fcaps: clear the same personality flags as suid when fcaps are used
      mpi: Avoid using freed pointer in mpi_lshift_limbs()
      Smack: move label list initialization
  2. @torvalds

    xz: Enable BCJ filters on SPARC and 32-bit x86

    Lasse Collin authored torvalds committed
    The BCJ filters were meant to be enabled already on these
    archs, but the xz_wrap.sh script was buggy. Enabling the
    filters should give smaller kernel images.
    
    xz_wrap.sh will now use $SRCARCH instead of $ARCH to detect
    the architecture. That way it doesn't need to care about the
    subarchs (like i386 vs. x86_64) since the BCJ filters don't
    care either.
    
    Signed-off-by: Lasse Collin <lasse.collin@tukaani.org>
    Acked-by: Jan Beulich <jbeulich@suse.com>
    Acked-by: H. Peter Anvin <hpa@zytor.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

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

    torvalds authored
    …el/git/jgarzik/libata-dev
    
    Pull libara fixes from Jeff Garzik:
    
     - Notable regression fix.  Forbid dynamic runtime power management by
       default, due to issues with suspend/resume and hotplug.
    
       To re-enable, use sysfs.
    
     - make ata_print_id atomic, due to ref from multiple contexts
    
     - sata_mv warning fix
    
     - ata_piix new PCI ID
    
    * tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      libata: forbid port runtime pm by default, fixing regression
      libata: make ata_print_id atomic
      sata_mv: silence an uninitialized variable warning
      ata_piix: IDE-mode SATA patch for Intel DH89xxCC DeviceIDs
  4. libata: forbid port runtime pm by default, fixing regression

    Lin Ming authored Jeff Garzik committed
    Forbid port runtime pm by default because it has known hotplug issue.
    User can allow it by, for example
    
    echo auto > /sys/devices/pci0000:00/0000:00:1f.2/ata2/power/control
    
    Signed-off-by: Lin Ming <ming.m.lin@intel.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  5. @torvalds

    Revert "ACPI: Make ACPI interrupt threaded"

    Thomas Gleixner authored torvalds committed
    This reverts commit 6fe0d06.
    
    Paul bisected this regression.
    
    The conversion was done blindly and is wrong, as it does not provide a
    primary handler to disable the level type irq on the device level.
    Neither does it set the IRQF_ONESHOT flag which handles that at the irq
    line level.  This can't be done as the interrupt might be shared, though
    we might extend the core to force it.
    
    So an interrupt on this line will wake up the thread, but immediately
    unmask the irq after that.  Due to the interrupt being level type the
    hardware interrupt is raised over and over and prevents the irq thread
    from handling it.  Fail.
    
    request_irq() unfortunately does not refuse such a request and the patch
    was obviously never tested with real interrupts.
    
    Bisected-by: Paul Bolle <pebolle@tiscali.nl>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @eparis

    fcaps: clear the same personality flags as suid when fcaps are used

    eparis authored James Morris committed
    If a process increases permissions using fcaps all of the dangerous
    personality flags which are cleared for suid apps should also be cleared.
    Thus programs given priviledge with fcaps will continue to have address space
    randomization enabled even if the parent tried to disable it to make it
    easier to attack.
    
    Signed-off-by: Eric Paris <eparis@redhat.com>
    Reviewed-by: Serge Hallyn <serge.hallyn@canonical.com>
    Signed-off-by: James Morris <james.l.morris@oracle.com>
  7. @jjuhl

    mpi: Avoid using freed pointer in mpi_lshift_limbs()

    jjuhl authored James Morris committed
    At the start of the function we assign 'a->d' to 'ap'. Then we use the
    RESIZE_IF_NEEDED macro on 'a' - this may free 'a->d' and replace it
    with newly allocaetd storage. In that case, we'll be operating on
    freed memory further down in the function when we index into 'ap[]'.
    Since we don't actually need 'ap' until after the use of the
    RESIZE_IF_NEEDED macro we can just delay the assignment to it until
    after we've potentially resized, thus avoiding the issue.
    
    While I was there anyway I also changed the integer variable 'n' to be
    const. It might as well be since we only assign to it once and use it
    as a constant, and then the compiler will tell us if we ever assign to
    it in the future.
    
    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    Acked-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
    Signed-off-by: James Morris <james.l.morris@oracle.com>
  8. @cschaufler

    Smack: move label list initialization

    cschaufler authored James Morris committed
    A kernel with Smack enabled will fail if tmpfs has xattr support.
    
    Move the initialization of predefined Smack label
    list entries to the LSM initialization from the
    smackfs setup. This became an issue when tmpfs
    acquired xattr support, but was never correct.
    
    Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
    Signed-off-by: James Morris <james.l.morris@oracle.com>
Commits on Apr 17, 2012
  1. @torvalds

    Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kern…

    torvalds authored
    …el/git/tytso/ext4
    
    Pull ext4 regression fixes from Ted Ts'o:
     "This fixes a scalability problem reported by Andi Kleen and Tim Chen;
      they were quite secretive about the precise nature of their workload,
      but they later admitted that it only showed up when they were using a
      large sparse file, so the amount of data I/O that was needed was close
      to zero.
    
      I'm not sure how realistic this is and it's only a regression if you
      consider changes made since 2.6.39 to be a "regression" vis-a-vis the
      policy regarding post-merge window bug fixes, but Linus agreed it was
      worth fixing, so I'm including it in this pull request.
    
      This also fixes the journalled quota mount options, which I
      accidentally broke while I was cleaning up the mount option handling."
    
    * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: fix handling of journalled quota options
      ext4: address scalability issue by removing extent cache statistics
  2. @torvalds

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

    torvalds authored
    …/git/viro/vfs
    
    Pull vfs fixes from Al Viro:
     "A bunch of endianness fixes and a couple of nfsd error value fixes.
    
      Speaking of endianness stuff, I'm rather tempted to slap
    
    	ccflags-y += -D__CHECK_ENDIAN__
    
      in fs/Makefile, if not making it default for the entire tree; nfsd
      regressions I've caught make one hell of a pile and we'd obviously
      benefit from having that kind of stuff caught earlier..."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
      lockd: fix the endianness bug
      ocfs2: ->e_leaf_clusters endianness breakage
      ocfs2: ->rl_count endianness breakage
      ocfs: ->rl_used breakage on big-endian
      ocfs2: ->l_next_free_req breakage on big-endian
      btrfs: btrfs_root_readonly() broken on big-endian
      ext4: fix endianness breakage in ext4_split_extent_at()
      nfsd: fix compose_entry_fh() failure exits
      nfsd: fix error value on allocation failure in nfsd4_decode_test_stateid()
      nfsd: fix endianness breakage in TEST_STATEID handling
      nfsd: fix error values returned by nfsd4_lockt() when nfsd_open() fails
      nfsd: fix b0rken error value for setattr on read-only mount
  3. @torvalds

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

    torvalds authored
    Pull CIFS fixes from Steve French.
    
    * git://git.samba.org/sfrench/cifs-2.6:
      Fix number parsing in cifs_parse_mount_options
      Cleanup handling of NULL value passed for a mount option
  4. @torvalds

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

    torvalds authored
    …linux/kernel/git/tip/tip
    
    Pull perf fixes from Ingo Molnar.
    
    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86: Handle failures of parsing immediate operands in the instruction decoder
      perf archive: Correct cutting of symbolic link
      perf tools: Ignore auto-generated bison/flex files
      perf tools: Fix parsers' rules to dependencies
      perf tools: fix NO_GTK2 Makefile config error
      perf session: Skip event correctly for unknown id/machine
  5. @torvalds

    Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds authored
    …t/mst/vhost
    
    Pull virtio fixes from Michael S. Tsirkin:
     "Here are some virtio fixes for 3.4: a test build fix, a patch by Ren
      fixing naming for systems with a massive number of virtio blk devices,
      and balloon fixes for powerpc by David Gibson.
    
      There was some discussion about Ren's patch for virtio disc naming:
      some people wanted to move the legacy name mangling function to the
      block core.  But there's no concensus on that yet, and we can always
      deduplicate later.  Added comments in the hope that this will stop
      people from copying this legacy naming scheme into future drivers."
    
    * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
      virtio_balloon: fix handling of PAGE_SIZE != 4k
      virtio_balloon: Fix endian bug
      virtio_blk: helper function to format disk names
      tools/virtio: fix up vhost/test module build
  6. @rjwysocki @torvalds

    PCI: Retry BARs restoration for Type 0 headers only

    rjwysocki authored torvalds committed
    Some shortcomings introduced into pci_restore_state() by commit
    26f4106 ("PCI: check for pci bar restore completion and retry")
    have been fixed by recent commit ebfc5b8 ("PCI: Fix regression in
    pci_restore_state(), v3"), but that commit treats all PCI devices as
    those with Type 0 configuration headers.
    
    That is not entirely correct, because Type 1 and Type 2 headers have
    different layouts.  In particular, the area occupied by BARs in Type 0
    config headers contains the secondary status register in Type 1 ones and
    it doesn't make sense to retry the restoration of that register even if
    the value read back from it after a write is not the same as the written
    one (it very well may be different).
    
    For this reason, make pci_restore_state() only retry the restoration
    of BARs for Type 0 config headers.  This effectively makes it behave
    as before commit 26f4106 for all header types except for Type 0.
    
    Tested-by: Mikko Vinni <mmvinni@yahoo.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @torvalds

    Documentation: maintainer change

    Randy Dunlap authored torvalds committed
    I'm dropping off as Documentation/ maintainer.
    Rob Landley has agreed to take it over.  Thanks, Rob.
    
    I'll still be around reviewing patches and testing.
    
    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Acked-by: Rob Landley <rob@landley.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @torvalds

    ia64: fix futex_atomic_cmpxchg_inatomic()

    Luck, Tony authored torvalds committed
    Michel Lespinasse cleaned up the futex calling conventions in commit
    37a9d91 ("futex: Sanitize cmpxchg_futex_value_locked API").
    
    But the ia64 implementation was subtly broken.  Gcc does not know that
    register "r8" will be updated by the fault handler if the cmpxchg
    instruction takes an exception.  So it feels safe in letting the
    initialization of r8 slide to after the cmpxchg.  Result: we always
    return 0 whether the user address faulted or not.
    
    Fix by moving the initialization of r8 into the __asm__ code so gcc
    won't move it.
    
    Reported-by: <emeric.maschino@gmail.com>
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=42757
    Tested-by: <emeric.maschino@gmail.com>
    Acked-by: Michel Lespinasse <walken@google.com>
    Cc: stable@vger.kernel.org # v2.6.39+
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Apr 16, 2012
  1. @tytso

    ext4: fix handling of journalled quota options

    tytso authored
    Commit 26092bf broke handling of journalled quota mount options by
    trying to parse argument of every mount option as a number.  Fix this
    by dealing with the quota options before we call match_int().
    
    Thanks to Jan Kara for discovering this regression.
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Reviewed-by: Jan Kara <jack@suse.cz>
  2. @JoePerches @torvalds

    checkpatch: revert --strict test for net/ and drivers/net block comme…

    JoePerches authored torvalds committed
    …nt style
    
    Revert the --strict test for the old preferred block
    comment style in drivers/net and net/
    
    Reported-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @tytso

    ext4: address scalability issue by removing extent cache statistics

    tytso authored
    Andi Kleen and Tim Chen have reported that under certain circumstances
    the extent cache statistics are causing scalability problems due to
    cache line bounces.
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Cc: stable@vger.kernel.org
  4. @mhiramathitachi

    x86: Handle failures of parsing immediate operands in the instruction…

    mhiramathitachi authored Ingo Molnar committed
    … decoder
    
    This can happen if the instruction is much longer than the maximum length,
    or if insn->opnd_bytes is manually changed.
    
    This patch also fixes warnings from -Wswitch-default flag.
    
    Reported-by: Prashanth Nageshappa <prashanth@linux.vnet.ibm.com>
    Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
    Cc: Jim Keniston <jkenisto@linux.vnet.ibm.com>
    Cc: Linux-mm <linux-mm@kvack.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Andi Kleen <andi@firstfloor.org>
    Cc: Christoph Hellwig <hch@infradead.org>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
    Cc: Anton Arapov <anton@redhat.com>
    Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
    Cc: yrl.pp-manager.tt@hitachi.com
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lkml.kernel.org/r/20120413032427.32577.42602.stgit@localhost.localdomain
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
  5. @torvalds

    Linux 3.4-rc3

    torvalds authored
  6. @torvalds

    Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

    torvalds authored
    Pull ARM fixes from Russell King:
     "Nothing too disasterous, the biggest thing being the removal of the
      regulator support for vcore in the AMBA driver; only one SoC was using
      this and it got broken during the last merge window, which then
      started causing problems for other people.  Mutual agreement was
      reached for it to be removed."
    
    * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
      ARM: 7386/1: jump_label: fixup for rename to static_key
      ARM: 7384/1: ThumbEE: Disable userspace TEEHBR access for !CONFIG_ARM_THUMBEE
      ARM: 7382/1: mm: truncate memory banks to fit in 4GB space for classic MMU
      ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus
      ARM: 7383/1: nommu: populate vectors page from paging_init
      ARM: 7381/1: nommu: fix typo in mm/Kconfig
      ARM: 7380/1: DT: do not add a zero-sized memory property
      ARM: 7379/1: DT: fix atags_to_fdt() second call site
      ARM: 7366/3: amba: Remove AMBA level regulator support
      ARM: 7377/1: vic: re-read status register before dispatching each IRQ handler
      ARM: 7368/1: fault.c: correct how the tsk->[maj|min]_flt gets incremented
  7. @torvalds

    x86-32: fix up strncpy_from_user() sign error

    torvalds authored
    The 'max' range needs to be unsigned, since the size of the user address
    space is bigger than 2GB.
    
    We know that 'count' is positive in 'long' (that is checked in the
    caller), so we will truncate 'max' down to something that fits in a
    signed long, but before we actually do that, that comparison needs to be
    done in unsigned.
    
    Bug introduced in commit 92ae03f ("x86: merge 32/64-bit versions of
    'strncpy_from_user()' and speed it up").  On x86-64 you can't trigger
    this, since the user address space is much smaller than 63 bits, and on
    x86-32 it works in practice, since you would seldom hit the strncpy
    limits anyway.
    
    I had actually tested the corner-cases, I had only tested them on
    x86-64.  Besides, I had only worried about the case of a pointer *close*
    to the end of the address space, rather than really far away from it ;)
    
    This also changes the "we hit the user-specified maximum" to return
    'res', for the trivial reason that gcc seems to generate better code
    that way.  'res' and 'count' are the same in that case, so it really
    doesn't matter which one we return.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Apr 15, 2012
  1. @rabinv

    ARM: 7386/1: jump_label: fixup for rename to static_key

    rabinv authored Russell King committed
    c5905af ("static keys: Introduce 'struct static_key'...") renamed
    struct jump_label_key to struct static_key.  Fixup ARM for this to
    eliminate these build warnings:
    
      include/linux/jump_label.h:113:2:
      warning: passing argument 1 of 'arch_static_branch' from incompatible pointer type
      include/asm/jump_label.h:17:82:
      note: expected 'struct jump_label_key *' but argument is of type 'struct static_key *'
    
    Signed-off-by: Rabin Vincent <rabin@rab.in>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  2. @jaustin

    ARM: 7384/1: ThumbEE: Disable userspace TEEHBR access for !CONFIG_ARM…

    jaustin authored Russell King committed
    …_THUMBEE
    
    Currently when ThumbEE is not enabled (!CONFIG_ARM_THUMBEE) the ThumbEE
    register states are not saved/restored at context switch. The default state
    of the ThumbEE Ctrl register (TEECR) allows userspace accesses to the
    ThumbEE Base Handler register (TEEHBR). This can cause unexpected behaviour
    when people use ThumbEE on !CONFIG_ARM_THUMBEE kernels, as well as allowing
    covert communication - eg between userspace tasks running inside chroot
    jails.
    
    This patch sets up TEECR in order to prevent user-space access to TEEHBR
    when !CONFIG_ARM_THUMBEE. In this case, tasks are sent SIGILL if they try to
    access TEEHBR.
    
    Cc: stable@vger.kernel.org
    Reviewed-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Jonathan Austin <jonathan.austin@arm.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  3. @wildea01

    ARM: 7382/1: mm: truncate memory banks to fit in 4GB space for classi…

    wildea01 authored Russell King committed
    …c MMU
    
    If a bank of memory spanning the 4GB boundary is added on a !CONFIG_LPAE
    kernel then we will hang early during boot since the memory bank will
    have wrapped around to zero.
    
    This patch truncates memory banks for !LPAE configurations when the end
    address is not representable in 32 bits.
    
    Acked-by: Nicolas Pitre <nico@linaro.org>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  4. @linusw

    ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus

    linusw authored Russell King committed
    During booting of cpu1, there is a short window where cpu1
    is online, but not active where cpu1 is occupied by waiting
    to become active. If cpu0 then decides to schedule something
    on cpu1 and wait for it to complete, before cpu0 has set
    cpu1 active, we have a deadlock.
    
    Typically it's this CPU frequency transition that happens at
    this time, so let's just not wait for it to happen, it will
    happen whenever the CPU eventually comes online instead.
    
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: stable@kernel.org
    Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
    Reviewed-by: Rickard Andersson <rickard.andersson@stericsson.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  5. @rjwysocki @torvalds

    PCI: Fix regression in pci_restore_state(), v3

    rjwysocki authored torvalds committed
    Commit 26f4106 ("PCI: check for pci bar restore completion and
    retry") attempted to address problems with PCI BAR restoration on
    systems where FLR had not been completed before pci_restore_state() was
    called, but it did that in an utterly wrong way.
    
    First off, instead of retrying the writes for the BAR registers only, it
    did that for all of the PCI config space of the device, including the
    status register (whose value after the write quite obviously need not be
    the same as the written one).  Second, it added arbitrary delay to
    pci_restore_state() even for systems where the PCI config space
    restoration was successful at first attempt.  Finally, the mdelay(10) it
    added to every iteration of the writing loop was way too much of a delay
    for any reasonable device.
    
    All of this actually caused resume failures for some devices on Mikko's
    system.
    
    To fix the regression, make pci_restore_state() only retry the writes
    for BAR registers and only wait if the first read from the register
    doesn't return the written value.  Additionaly, make it wait for 1 ms,
    instead of 10 ms, after every failing attempt to write into config
    space.
    
    Reported-by: Mikko Vinni <mmvinni@yahoo.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

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

    torvalds authored
    …nel/git/arm/arm-soc
    
    Pull "ARM: a few more SoC fixes for 3.4-rc" from Olof Johansson:
     - A handful of warning and build fixes for Qualcomm MSM
     - Build/warning and bug fixes for Samsung Exynos
     - A fix from Rob Herring that removes misplaced interrupt-parent
       properties from a few device trees
     - A fix to OMAP dealing with cpufreq build errors, removing some of the
       offending code since it was redundant anyway
    
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: OMAP: clock: cleanup CPUfreq leftovers, fix build errors
      ARM: dts: remove blank interrupt-parent properties
      ARM: EXYNOS: Fix Kconfig dependencies for device tree enabled machine files
      ARM: EXYNOS: Remove broken config values for touchscren for NURI board
      ARM: EXYNOS: set fix xusbxti clock for NURI and Universal210 boards
      ARM: EXYNOS: fix regulator name for NURI board
      ARM: SAMSUNG: make SAMSUNG_PM_DEBUG select DEBUG_LL
      ARM: msm: Fix section mismatches in proc_comm.c
      video: msm: Fix section mismatches in mddi.c
      arm: msm: trout: fix compile failure
      arm: msm: halibut: remove unneeded fixup
      ARM: EXYNOS: Add PDMA and MDMA physical base address defines
      ARM: S5PV210: Fix compiler warning in dma.c file
      ARM: EXYNOS: Fix compile error in exynos5250-cpufreq.c
      ARM: EXYNOS: Add missing definition for IRQ_I2S0
      ARM: S5PV210: fix unused LDO supply field from wm8994_pdata
  7. @torvalds

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

    torvalds authored
    …t/tiwai/sound
    
    Pull another round of sound fixes from Takashi Iwai:
     "A few regression fixes for Realtek HD-audio codecs, mainly specific to
      some laptop models."
    
    * tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
      ALSA: hda/realtek - Fix mem leak (and rid us of trailing whitespace).
      ALSA: hda/realtek - Add quirk for Mac Pro 5,1 machines
      ALSA: hda/realtek - Add a fixup entry for Acer Aspire 8940G
      ALSA: hda/realtek - Fix GPIO1 setup for Acer Aspire 4930 & co
      ALSA: hda/realtek - Add a few ALC882 model strings back
  8. @torvalds

    SCSI: Fix error handling when no ULD is attached

    Martin K. Petersen authored torvalds committed
    Commit 18a4d0a ("[SCSI] Handle disk devices which can not process
    medium access commands") introduced a bug in which we would attempt to
    dereference the scsi driver even when the device had no ULD attached.
    
    Ensure that a driver is registered and make the driver accessor function
    more resilient to errors during device discovery.
    
    Reported-by: Elric Fu <elricfu1@gmail.com>
    Reported-by: Bart Van Assche <bvanassche@acm.org>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @mstsirkin

    virtio_balloon: fix handling of PAGE_SIZE != 4k

    mstsirkin authored
    As reported by David Gibson, current code handles PAGE_SIZE != 4k
    completely wrong which can lead to guest memory corruption errors:
    
    - page_to_balloon_pfn is wrong: e.g. on system with 64K page size
     it gives the same pfn value for 16 different pages.
    
    - we also need to convert back to linux pfns when we free.
    
    - for each linux page we need to tell host about multiple balloon
      pages, but code only adds one pfn to the array.
    
    This patch fixes all that, tested with a 64k ppc64 kernel.
    
    Reported-by: David Gibson <david@gibson.dropbear.id.au>
    Tested-by: David Gibson <david@gibson.dropbear.id.au>
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  10. @dgibson @mstsirkin

    virtio_balloon: Fix endian bug

    dgibson authored mstsirkin committed
    Although virtio config space fields are usually in guest-native endian,
    the spec for the virtio balloon device explicitly states that both fields
    in its config space are little-endian.
    
    However, the current virtio_balloon driver does not have a suitable endian
    swap for the 'num_pages' field, although it does have one for the 'actual'
    field.  This patch corrects the bug, adding sparse annotation while we're
    at it.
    
    Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  11. Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/lin…

    Ingo Molnar authored
    …ux/kernel/git/acme/linux into perf/urgent
    
    Pull perf tooling fixes from Arnaldo Carvalho de Melo:
    
    . Properly handle ~/.debug, the build id cache, when it is a symlink,
      fix from Chanho Park
    
    . Fixes for the parser generation process, from Jiri Olsa and Namhyung Kim
    
    . Fix build when NO_GTK2 is specified, From Stephane Eranian
    
    . When a machine is not found, bump the relevant error stat but return
      0, so that we correctly move to the next perf event. Fix from Jiri Olsa
    
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
  12. @olofj

    Merge branch 'v3.4-samsung-fixes-2' of git://git.kernel.org/pub/scm/l…

    olofj authored
    …inux/kernel/git/kgene/linux-samsung into fixes
    
    * 'v3.4-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
      ARM: EXYNOS: Fix Kconfig dependencies for device tree enabled machine files
      ARM: EXYNOS: Remove broken config values for touchscren for NURI board
      ARM: EXYNOS: set fix xusbxti clock for NURI and Universal210 boards
      ARM: EXYNOS: fix regulator name for NURI board
      ARM: SAMSUNG: make SAMSUNG_PM_DEBUG select DEBUG_LL
      ARM: EXYNOS: Add PDMA and MDMA physical base address defines
      ARM: S5PV210: Fix compiler warning in dma.c file
      ARM: EXYNOS: Fix compile error in exynos5250-cpufreq.c
      ARM: EXYNOS: Add missing definition for IRQ_I2S0
      ARM: S5PV210: fix unused LDO supply field from wm8994_pdata
Something went wrong with that request. Please try again.