09 Feb, 2015

4 commits


06 Feb, 2015

1 commit


02 Feb, 2015

2 commits

  • Pull ARM SoC fixes from Olof Johansson:
    "One more week's worth of fixes. Worth pointing out here are:

    - A patch fixing detaching of iommu registrations when a device is
    removed -- earlier the ops pointer wasn't managed properly
    - Another set of Renesas boards get the same GIC setup fixup as
    others have in previous -rcs
    - Serial port aliases fixups for sunxi. We did the same to tegra but
    we caught that in time before the merge window due to more machines
    being affected. Here it took longer for anyone to notice.
    - A couple more DT tweaks on sunxi
    - A follow-up patch for the mvebu coherency disabling in last -rc
    batch"

    * tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    arm: dma-mapping: Set DMA IOMMU ops in arm_iommu_attach_device()
    ARM: shmobile: r8a7790: Instantiate GIC from C board code in legacy builds
    ARM: shmobile: r8a73a4: Instantiate GIC from C board code in legacy builds
    ARM: mvebu: don't set the PL310 in I/O coherency mode when I/O coherency is disabled
    ARM: sunxi: dt: Fix aliases
    ARM: dts: sun4i: Add simplefb node with de_fe0-de_be0-lcd0-hdmi pipeline
    ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias
    ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i

    Linus Torvalds
     
  • …ernel/git/horms/renesas into fixes

    Merge "Third Round of Renesas ARM Based SoC Fixes for v3.19" from Simon Horman:

    * Instantiate GIC from C board code in legacy builds on r8a7790 and r8a73a4

    * tag 'renesas-soc-fixes3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
    ARM: shmobile: r8a7790: Instantiate GIC from C board code in legacy builds
    ARM: shmobile: r8a73a4: Instantiate GIC from C board code in legacy builds

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     

31 Jan, 2015

3 commits

  • Pull perf fixes from Ingo Molnar:
    "Mostly tooling fixes, but also an event groups fix, two PMU driver
    fixes and a CPU model variant addition"

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    perf: Tighten (and fix) the grouping condition
    perf/x86/intel: Add model number for Airmont
    perf/rapl: Fix crash in rapl_scale()
    perf/x86/intel/uncore: Move uncore_box_init() out of driver initialization
    perf probe: Fix probing kretprobes
    perf symbols: Introduce 'for' method to iterate over the symbols with a given name
    perf probe: Do not rely on map__load() filter to find symbols
    perf symbols: Introduce method to iterate symbols ordered by name
    perf symbols: Return the first entry with a given name in find_by_name method
    perf annotate: Fix memory leaks in LOCK handling
    perf annotate: Handle ins parsing failures
    perf scripting perl: Force to use stdbool
    perf evlist: Remove extraneous 'was' on error message

    Linus Torvalds
     
  • Pull KVM fixes from Paolo Bonzini:
    "The ARM changes are largish, but not too scary. And a simple fix for
    x86 (bug introduced in 3.19)"

    (Paolo sayus these are the "Final" fixes. We'll see).

    * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
    KVM: x86: check LAPIC presence when building apic_map
    arm/arm64: KVM: Use kernel mapping to perform invalidation on page fault
    arm/arm64: KVM: Invalidate data cache on unmap
    arm/arm64: KVM: Use set/way op trapping to track the state of the caches

    Linus Torvalds
     
  • Fix misspelled define.

    Fixes: 33692f27597f ("vm: add VM_FAULT_SIGSEGV handling support")
    Signed-off-by: Guenter Roeck
    Signed-off-by: Linus Torvalds

    Guenter Roeck
     

30 Jan, 2015

7 commits

  • We forgot to re-check LAPIC after splitting the loop in commit
    173beedc1601 (KVM: x86: Software disabled APIC should still deliver
    NMIs, 2014-11-02).

    Signed-off-by: Radim Krčmář
    Fixes: 173beedc1601f51dae9d579aa7a414c5aa8f700b
    Signed-off-by: Paolo Bonzini

    Radim Krčmář
     
  • …t/kvmarm/kvmarm into kvm-master

    Second round of fixes for KVM/ARM for 3.19.

    Fixes memory corruption issues on APM platforms and swapping issues on
    DMA-coherent systems.

    Paolo Bonzini
     
  • When handling a fault in stage-2, we need to resync I$ and D$, just
    to be sure we don't leave any old cache line behind.

    That's very good, except that we do so using the *user* address.
    Under heavy load (swapping like crazy), we may end up in a situation
    where the page gets mapped in stage-2 while being unmapped from
    userspace by another CPU.

    At that point, the DC/IC instructions can generate a fault, which
    we handle with kvm->mmu_lock held. The box quickly deadlocks, user
    is unhappy.

    Instead, perform this invalidation through the kernel mapping,
    which is guaranteed to be present. The box is much happier, and so
    am I.

    Signed-off-by: Marc Zyngier
    Signed-off-by: Christoffer Dall

    Marc Zyngier
     
  • Let's assume a guest has created an uncached mapping, and written
    to that page. Let's also assume that the host uses a cache-coherent
    IO subsystem. Let's finally assume that the host is under memory
    pressure and starts to swap things out.

    Before this "uncached" page is evicted, we need to make sure
    we invalidate potential speculated, clean cache lines that are
    sitting there, or the IO subsystem is going to swap out the
    cached view, loosing the data that has been written directly
    into memory.

    Signed-off-by: Marc Zyngier
    Signed-off-by: Christoffer Dall

    Marc Zyngier
     
  • Trying to emulate the behaviour of set/way cache ops is fairly
    pointless, as there are too many ways we can end-up missing stuff.
    Also, there is some system caches out there that simply ignore
    set/way operations.

    So instead of trying to implement them, let's convert it to VA ops,
    and use them as a way to re-enable the trapping of VM ops. That way,
    we can detect the point when the MMU/caches are turned off, and do
    a full VM flush (which is what the guest was trying to do anyway).

    This allows a 32bit zImage to boot on the APM thingy, and will
    probably help bootloaders in general.

    Signed-off-by: Marc Zyngier
    Signed-off-by: Christoffer Dall

    Marc Zyngier
     
  • Commit 4bb25789ed28228a ("arm: dma-mapping: plumb our iommu mapping ops
    into arch_setup_dma_ops") moved the setting of the DMA operations from
    arm_iommu_attach_device() to arch_setup_dma_ops() where the DMA
    operations to be used are selected based on whether the device is
    connected to an IOMMU. However, the IOMMU detection scheme requires the
    IOMMU driver to be ported to the new IOMMU of_xlate API. As no driver
    has been ported yet, this effectively breaks all IOMMU ARM users that
    depend on the IOMMU being handled transparently by the DMA mapping API.

    Fix this by restoring the setting of DMA IOMMU ops in
    arm_iommu_attach_device() and splitting the rest of the function into a
    new internal __arm_iommu_attach_device() function, called by
    arch_setup_dma_ops().

    Signed-off-by: Laurent Pinchart
    Acked-by: Will Deacon
    Tested-by: Heiko Stuebner
    Signed-off-by: Olof Johansson

    Laurent Pinchart
     
  • The core VM already knows about VM_FAULT_SIGBUS, but cannot return a
    "you should SIGSEGV" error, because the SIGSEGV case was generally
    handled by the caller - usually the architecture fault handler.

    That results in lots of duplication - all the architecture fault
    handlers end up doing very similar "look up vma, check permissions, do
    retries etc" - but it generally works. However, there are cases where
    the VM actually wants to SIGSEGV, and applications _expect_ SIGSEGV.

    In particular, when accessing the stack guard page, libsigsegv expects a
    SIGSEGV. And it usually got one, because the stack growth is handled by
    that duplicated architecture fault handler.

    However, when the generic VM layer started propagating the error return
    from the stack expansion in commit fee7e49d4514 ("mm: propagate error
    from stack expansion even for guard page"), that now exposed the
    existing VM_FAULT_SIGBUS result to user space. And user space really
    expected SIGSEGV, not SIGBUS.

    To fix that case, we need to add a VM_FAULT_SIGSEGV, and teach all those
    duplicate architecture fault handlers about it. They all already have
    the code to handle SIGSEGV, so it's about just tying that new return
    value to the existing code, but it's all a bit annoying.

    This is the mindless minimal patch to do this. A more extensive patch
    would be to try to gather up the mostly shared fault handling logic into
    one generic helper routine, and long-term we really should do that
    cleanup.

    Just from this patch, you can generally see that most architectures just
    copied (directly or indirectly) the old x86 way of doing things, but in
    the meantime that original x86 model has been improved to hold the VM
    semaphore for shorter times etc and to handle VM_FAULT_RETRY and other
    "newer" things, so it would be a good idea to bring all those
    improvements to the generic case and teach other architectures about
    them too.

    Reported-and-tested-by: Takashi Iwai
    Tested-by: Jan Engelhardt
    Acked-by: Heiko Carstens # "s390 still compiles and boots"
    Cc: linux-arch@vger.kernel.org
    Cc: stable@vger.kernel.org
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

29 Jan, 2015

4 commits

  • As of commit 9a1091ef0017c40a ("irqchip: gic: Support hierarchy irq
    domain."), the Lager legacy board support is known to be broken.

    The IRQ numbers of the GIC are now virtual, and no longer match the
    hardcoded hardware IRQ numbers in the legacy platform board code.

    To fix this issue specific to non-multiplatform r8a7790 and Lager:
    1) Instantiate the GIC from platform board code and also
    2) Skip over the DT arch timer as well as
    3) Force delay setup based on DT CPU frequency

    With these 3 fixes in place interrupts on Lager are now unbroken.

    Partially based on legacy GIC fix by Geert Uytterhoeven, thanks to
    him for the initial work.

    Signed-off-by: Magnus Damm
    Acked-by: Geert Uytterhoeven
    Signed-off-by: Simon Horman

    Magnus Damm
     
  • As of commit 9a1091ef0017c40a ("irqchip: gic: Support hierarchy irq
    domain."), the APE6EVM legacy board support is known to be broken.

    The IRQ numbers of the GIC are now virtual, and no longer match the
    hardcoded hardware IRQ numbers in the legacy platform board code.

    To fix this issue specific to non-muliplatform r8a73a4 and APE6EVM:
    1) Instantiate the GIC from platform board code and also
    2) Skip over the DT arch timer as well as
    3) Force delay setup based on DT CPU frequency

    With these 3 fixes in place interrupts on APE6EVM are now unbroken.

    Partially based on legacy GIC fix by Geert Uytterhoeven, thanks to
    him for the initial work.

    Signed-off-by: Magnus Damm
    Acked-by: Geert Uytterhoeven
    Signed-off-by: Simon Horman

    Magnus Damm
     
  • Merge "mvebu-fixes-6" from Andrew Lunn:

    The previous fix for Armada XP, disabling I/O coherency, broke Armada
    375/38x. Only switch the PL310 to I/O coherent mode if I/O coherency
    is enabled.

    * tag 'mvebu-fixes-3.19-6' of git://git.infradead.org/linux-mvebu:
    ARM: mvebu: don't set the PL310 in I/O coherency mode when I/O coherency is disabled

    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • Since commit f2c3c67f00 (merge commit that adds commit "ARM: mvebu:
    completely disable hardware I/O coherency"), we disable I/O coherency
    on Armada EBU platforms.

    However, we continue to initialize the coherency fabric, because this
    coherency fabric is needed on Armada XP for inter-CPU
    coherency. Unfortunately, due to this, we also continued to execute
    the coherency fabric initialization code for Armada 375/38x, which
    switched the PL310 into I/O coherent mode. This has the effect of
    disabling the outer cache sync operation: this is needed when I/O
    coherency is enabled to work around a PCIe/L2 deadlock. But obviously,
    when I/O coherency is disabled, having the outer cache sync operation
    is crucial.

    Therefore, this commit fixes the armada_375_380_coherency_init() so
    that the PL310 is switched to I/O coherent mode only if I/O coherency
    is enabled.

    Without this fix, all devices using DMA are broken on Armada 375/38x.

    Signed-off-by: Thomas Petazzoni
    Acked-by: Gregory CLEMENT
    Tested-by: Gregory CLEMENT
    Signed-off-by: Andrew Lunn
    Cc: # v3.8+

    Thomas Petazzoni
     

28 Jan, 2015

5 commits

  • Intel Airmont supports the same architectural and non-architectural
    performance monitoring events as Silvermont.

    Signed-off-by: Kan Liang
    Signed-off-by: Peter Zijlstra (Intel)
    Cc: Arnaldo Carvalho de Melo
    Cc: Linus Torvalds
    Link: http://lkml.kernel.org/r/1421913053-99803-1-git-send-email-kan.liang@intel.com
    Signed-off-by: Ingo Molnar

    Kan Liang
     
  • This patch fixes a systematic crash in rapl_scale()
    due to an invalid pointer.

    The bug was introduced by commit:

    89cbc76768c2 ("x86: Replace __get_cpu_var uses")

    The fix is simple. Just put the parenthesis where it needs
    to be, i.e., around rapl_pmu. To my surprise, the compiler
    was not complaining about passing an integer instead of a
    pointer.

    Reported-by: Vince Weaver
    Tested-by: Vince Weaver
    Fixes: 89cbc76768c2 ("x86: Replace __get_cpu_var uses")
    Signed-off-by: Stephane Eranian
    Signed-off-by: Peter Zijlstra (Intel)
    Cc: Arnaldo Carvalho de Melo
    Cc: cl@linux.com
    Cc: Linus Torvalds
    Link: http://lkml.kernel.org/r/20150122203834.GA10228@thinkpad
    Signed-off-by: Ingo Molnar

    Stephane Eranian
     
  • There were some issues about the uncore driver tried to access
    non-existing boxes, which caused boot crashes. These issues have
    been all fixed. But we should avoid boot failures if that ever
    happens again.

    This patch intends to prevent this kind of potential issues.
    It moves uncore_box_init out of driver initialization. The box
    will be initialized when it's first enabled.

    Signed-off-by: Kan Liang
    Signed-off-by: Peter Zijlstra (Intel)
    Link: http://lkml.kernel.org/r/1421729665-5912-1-git-send-email-kan.liang@intel.com
    Cc: Arnaldo Carvalho de Melo
    Cc: Stephane Eranian
    Cc: Yan, Zheng
    Signed-off-by: Ingo Molnar

    Kan Liang
     
  • Pull networking fixes from David Miller:

    1) Don't OOPS on socket AIO, from Christoph Hellwig.

    2) Scheduled scans should be aborted upon RFKILL, from Emmanuel
    Grumbach.

    3) Fix sleep in atomic context in kvaser_usb, from Ahmed S Darwish.

    4) Fix RCU locking across copy_to_user() in bpf code, from Alexei
    Starovoitov.

    5) Lots of crash, memory leak, short TX packet et al bug fixes in
    sh_eth from Ben Hutchings.

    6) Fix memory corruption in SCTP wrt. INIT collitions, from Daniel
    Borkmann.

    7) Fix return value logic for poll handlers in netxen, enic, and bnx2x.
    From Eric Dumazet and Govindarajulu Varadarajan.

    8) Header length calculation fix in mac80211 from Fred Chou.

    9) mv643xx_eth doesn't handle highmem correctly in non-TSO code paths.
    From Ezequiel Garcia.

    10) udp_diag has bogus logic in it's hash chain skipping, copy same fix
    tcp diag used. From Herbert Xu.

    11) amd-xgbe programs wrong rx flow control register, from Thomas
    Lendacky.

    12) Fix race leading to use after free in ping receive path, from Subash
    Abhinov Kasiviswanathan.

    13) Cache redirect routes otherwise we can get a heavy backlog of rcu
    jobs liberating DST_NOCACHE entries. From Hannes Frederic Sowa.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (48 commits)
    net: don't OOPS on socket aio
    stmmac: prevent probe drivers to crash kernel
    bnx2x: fix napi poll return value for repoll
    ipv6: replacing a rt6_info needs to purge possible propagated rt6_infos too
    sh_eth: Fix DMA-API usage for RX buffers
    sh_eth: Check for DMA mapping errors on transmit
    sh_eth: Ensure DMA engines are stopped before freeing buffers
    sh_eth: Remove RX overflow log messages
    ping: Fix race in free in receive path
    udp_diag: Fix socket skipping within chain
    can: kvaser_usb: Fix state handling upon BUS_ERROR events
    can: kvaser_usb: Retry the first bulk transfer on -ETIMEDOUT
    can: kvaser_usb: Send correct context to URB completion
    can: kvaser_usb: Do not sleep in atomic context
    ipv4: try to cache dst_entries which would cause a redirect
    samples: bpf: relax test_maps check
    bpf: rcu lock must not be held when calling copy_to_user()
    net: sctp: fix slab corruption from use after free on INIT collisions
    net: mv643xx_eth: Fix highmem support in non-TSO egress path
    sh_eth: Fix serialisation of interrupt disable with interrupt & NAPI handlers
    ...

    Linus Torvalds
     
  • Pull powerpc fixes from Michael Ellerman:
    "Two powerpc fixes"

    * tag 'powerpc-3.19-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
    powerpc/powernv: Restore LPCR with LPCR_PECE1 cleared
    powerpc/xmon: Fix another endiannes issue in RTAS call from xmon

    Linus Torvalds
     

27 Jan, 2015

2 commits

  • …git/mripard/linux into fixes

    Merge "Allwinner fixes for 3.19" from Maxime Ripard:

    Allwinner fixes for 3.19

    A few minor fixes for the 3.19 kernel:
    - The 8250 uart driver now respects the aliases, which pointed out that we
    were using them wrong. Fixed them.
    - The simplefb pipeline that was used on the A10 caused flickering and
    tearing, and rendered it pretty much useless. Added a new simplefb node
    with another pipeline that removes this issue. Note that we need to keep
    the old node because u-boot 2015.01 uses it.
    - Added a fix for the USB phy node on sun4i/sun5i

    * tag 'sunxi-fixes-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
    ARM: sunxi: dt: Fix aliases
    ARM: dts: sun4i: Add simplefb node with de_fe0-de_be0-lcd0-hdmi pipeline
    ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias
    ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • Commit e6023367d779 ("x86, kaslr: Prevent .bss from overlaping initrd")
    added Perl to the required build environment. This reimplements in
    shell the Perl script used to find the size of the kernel with bss and
    brk added.

    Signed-off-by: Kees Cook
    Reported-by: Rob Landley
    Acked-by: Rob Landley
    Cc: Anca Emanuel
    Cc: Fengguang Wu
    Cc: Junjie Mao
    Cc: Kees Cook
    Cc: Thomas Gleixner
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kees Cook
     

26 Jan, 2015

4 commits

  • Pull x86 fixes from Thomas Gleixner:
    "Hopefully the last round of fixes for 3.19

    - regression fix for the LDT changes
    - regression fix for XEN interrupt handling caused by the APIC
    changes
    - regression fixes for the PAT changes
    - last minute fixes for new the MPX support
    - regression fix for 32bit UP
    - fix for a long standing relocation issue on 64bit tagged for stable
    - functional fix for the Hyper-V clocksource tagged for stable
    - downgrade of a pr_err which tends to confuse users

    Looks a bit on the large side, but almost half of it are valuable
    comments"

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86/tsc: Change Fast TSC calibration failed from error to info
    x86/apic: Re-enable PCI_MSI support for non-SMP X86_32
    x86, mm: Change cachemode exports to non-gpl
    x86, tls: Interpret an all-zero struct user_desc as "no segment"
    x86, tls, ldt: Stop checking lm in LDT_empty
    x86, mpx: Strictly enforce empty prctl() args
    x86, mpx: Fix potential performance issue on unmaps
    x86, mpx: Explicitly disable 32-bit MPX support on 64-bit kernels
    x86, hyperv: Mark the Hyper-V clocksource as being continuous
    x86: Don't rely on VMWare emulating PAT MSR correctly
    x86, irq: Properly tag virtualization entry in /proc/interrupts
    x86, boot: Skip relocs when load address unchanged
    x86/xen: Override ACPI IRQ management callback __acpi_unregister_gsi
    ACPI: pci: Do not clear pci_dev->irq in acpi_pci_irq_disable()
    x86/xen: Treat SCI interrupt as normal GSI interrupt

    Linus Torvalds
     
  • Pull ARM SoC fixes from Olof Johansson:
    "A week's worth of fixes for various ARM platforms. Diff wise, the
    largest fix is for OMAP to deal with how GIC now registers interrupts
    (irq_domain_add_legacy() -> irq_domain_add_linear() changes).

    Besides this, a few more renesas platforms needed the GIC instatiation
    done for legacy boards. There's also a fix that disables coherency of
    mvebu due to issues, and a few other smaller fixes"

    * tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    arm64: dts: add baud rate to Juno stdout-path
    ARM: dts: imx25: Fix PWM "per" clocks
    bus: mvebu-mbus: fix support of MBus window 13
    Merge tag 'mvebu-fixes-3.19-3' of git://git.infradead.org/linux-mvebu into fixes
    ARM: mvebu: completely disable hardware I/O coherency
    ARM: OMAP: Work around hardcoded interrupts
    ARM: shmobile: r8a7779: Instantiate GIC from C board code in legacy builds
    ARM: shmobile: r8a7778: Instantiate GIC from C board code in legacy builds
    arm: boot: dts: dra7: enable dwc3 suspend PHY quirk

    Linus Torvalds
     
  • Pull vfs fixes from Al Viro:
    "A couple of fixes - deadlock in CIFS and build breakage in cris serial
    driver (resurfaced f_dentry in there)"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
    VFS: Convert file->f_dentry->d_inode to file_inode()
    fix deadlock in cifs_ioctl_clone()

    Linus Torvalds
     
  • Commit f77d55a3b56a ("serial: 8250_dw: get index of serial line from DT
    aliases") made the serial driver now use the serial aliases to get the tty
    number, pointing out that our aliases have been wrong all along.

    Remove them from the DTSI and add custom ones in the relevant boards.

    Signed-off-by: Maxime Ripard

    Maxime Ripard
     

25 Jan, 2015

1 commit

  • The commit (3d125f9c91c5) cause i.MX6SX sdb enet cannot work. The cause is
    the commit add mdio node with un-correct phy address.

    The patch just correct i.MX6sx sdb board enet phy address.

    V2:
    * As Shawn's suggestion that unit-address should match 'reg' property, so
    update ethernet-phy unit-address.

    Acked-by: Stefan Agner
    Signed-off-by: Fugang Duan
    Acked-by: Shawn Guo
    Signed-off-by: David S. Miller

    Nimrod Andy
     

24 Jan, 2015

7 commits

  • Pull PCI fixes from Bjorn Helgaas:
    "These are fixes for:

    - a resource management problem that causes a Radeon "Fatal error
    during GPU init" on machines where the BIOS programmed an invalid
    Root Port window. This was a regression in v3.16.

    - an Atheros AR93xx device that doesn't handle PCI bus resets
    correctly. This was a regression in v3.14.

    - an out-of-date email address"

    * tag 'pci-v3.19-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
    MAINTAINERS: Update Richard Zhu's email address
    sparc/PCI: Clip bridge windows to fit in upstream windows
    powerpc/PCI: Clip bridge windows to fit in upstream windows
    parisc/PCI: Clip bridge windows to fit in upstream windows
    mn10300/PCI: Clip bridge windows to fit in upstream windows
    microblaze/PCI: Clip bridge windows to fit in upstream windows
    ia64/PCI: Clip bridge windows to fit in upstream windows
    frv/PCI: Clip bridge windows to fit in upstream windows
    alpha/PCI: Clip bridge windows to fit in upstream windows
    x86/PCI: Clip bridge windows to fit in upstream windows
    PCI: Add pci_claim_bridge_resource() to clip window if necessary
    PCI: Add pci_bus_clip_resource() to clip to fit upstream window
    PCI: Pass bridge device, not bus, when updating bridge windows
    PCI: Mark Atheros AR93xx to avoid bus reset
    PCI: Add flag for devices where we can't use bus reset

    Linus Torvalds
     
  • Pull devicetree bug fixes and documentation updates from Grant Likely:
    "A few bugfixes for the new DT overlay feature, documentation updates,
    spelling corrections, and changes to MAINTAINERS. Nothing earth
    shattering here"

    * tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux:
    of/unittest: Overlays with sub-devices tests
    of/platform: Handle of_populate drivers in notifier
    of/overlay: Do not generate duplicate nodes
    devicetree: document the "qemu" and "virtio" vendor prefixes
    devicetree: document ARM bindings for QEMU's Firmware Config interface
    Documentation: of: fix typo in graph bindings
    dma-mapping: fix debug print to display correct dma_pfn_offset
    of: replace Asahi Kasei Corp vendor prefix
    ARM: dt: GIC: Spelling s/specific/specifier/, s/flaggs/flags/
    dt/bindings: arm-boards: Spelling s/pointong/pointing/
    MAINTAINERS: Update DT website and git repository
    MAINTAINERS: drop DT regex matching on of_get_property and of_match_table

    Linus Torvalds
     
  • …awnguo/linux into fixes

    Merge "ARM: imx: fixes for 3.19, 2nd round" from Shawn Guo:

    The i.MX fixes for 3.19, 2nd round:
    - Correct pwm clock assignment in i.MX25 device tree to fix the broken
    pwm support on i.MX25

    * tag 'imx-fixes-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
    ARM: dts: imx25: Fix PWM "per" clocks

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • Without explicit command-line parameters, the Juno UART ends up running
    at 57600 baud in the kernel, which is at odds with the 115200 baud used
    by the rest of the firmware. Since commit 7914a7c5651a5161 now lets us
    fix this by specifying default options in stdout-path, do so.

    Acked-by: Mark Rutland
    Signed-off-by: Robin Murphy
    Signed-off-by: Olof Johansson

    Robin Murphy
     
  • Pull kvm fixes from Paolo Bonzini:
    "Three small fixes.

    Two for x86 and one avoids that sparse bails out"

    * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
    KVM: x86: SYSENTER emulation is broken
    KVM: x86: Fix of previously incomplete fix for CVE-2014-8480
    KVM: fix sparse warning in include/trace/events/kvm.h

    Linus Torvalds
     
  • Pull ARM fixes from Russell King:
    "Another round of small ARM fixes.

    restore_user_regs early stack deallocation is buggy in the presence of
    FIQs which switch to SVC mode, and could lead to corrupted registers
    being returned to a user process given an inopportune FIQ event.

    Another bug was spotted in the ARM perf code where it could lose track
    of perf counter overflows, leading to incorrect perf results.

    Lastly, a bug in arm_add_memory() was spotted where the memory sizes
    aren't properly rounded. As most people pass properly rounded sizes,
    this hasn't been noticed"

    * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
    ARM: 8292/1: mm: fix size rounding-down of arm_add_memory() function
    ARM: 8255/1: perf: Prevent wraparound during overflow
    ARM: 8266/1: Remove early stack deallocation from restore_user_regs

    Linus Torvalds
     
  • Pull two arm64 fixes from Will Deacon:
    "Arm64 fixes seem to come in pairs recently. We've got a fix for
    removing device-tree blobs when doing a make clean and another one
    addressing a missing include, which fixes build failures in -next for
    allmodconfig (spotted by Mark's buildbot).

    Summary from signed tag:

    - fix cleaning of .dtbs following directory restructuring
    - fix allmodconfig build breakage in -next due to missing include"

    * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
    arm64: dump: Fix implicit inclusion of definition for PCI_IOBASE
    arm64: Add dtb files to archclean rule

    Linus Torvalds