08 Jan, 2016

1 commit

  • Have mdio_alloc() create the array of interrupt numbers, and
    initialize it to POLLING. This is what most MDIO drivers want, so
    allowing code to be removed from the drivers.

    Signed-off-by: Andrew Lunn
    Reviewed-by: Florian Fainelli
    Signed-off-by: David S. Miller

    Andrew Lunn
     

07 Jan, 2016

3 commits

  • David S. Miller
     
  • Pull networking fixes from David Miller:
    "As usual, there are a couple straggler bug fixes:

    1) qlcnic_alloc_mbx_args() error returns are not checked in qlcnic
    driver. Fix from Insu Yun.

    2) SKB refcounting bug in connector, from Florian Westphal.

    3) vrf_get_saddr() has to propagate fib_lookup() errors to it's
    callers, from David Ahern.

    4) Fix AF_UNIX splice/bind deadlock, from Rainer Weikusat.

    5) qdisc_rcu_free() fails to free the per-cpu qstats. Fix from John
    Fastabend.

    6) vmxnet3 driver passes wrong page to dma_map_page(), fix from
    Shrikrishna Khare.

    7) Don't allow zero cwnd in tcp_cwnd_reduction(), from Yuchung Cheng"

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
    tcp: fix zero cwnd in tcp_cwnd_reduction
    Driver: Vmxnet3: Fix regression caused by 5738a09
    net: qmi_wwan: Add WeTelecom-WPD600N
    mkiss: fix scribble on freed memory
    net: possible use after free in dst_release
    net: sched: fix missing free per cpu on qstats
    ARM: net: bpf: fix zero right shift
    6pack: fix free memory scribbles
    net: filter: make JITs zero A for SKF_AD_ALU_XOR_X
    bridge: Only call /sbin/bridge-stp for the initial network namespace
    af_unix: Fix splice-bind deadlock
    net: Propagate lookup failure in l3mdev_get_saddr to caller
    r8152: add reset_resume function
    connector: bump skb->users before callback invocation
    cxgb4: correctly handling failed allocation
    qlcnic: correctly handle qlcnic_alloc_mbx_args

    Linus Torvalds
     
  • A repeating pattern in drivers has become to use OF node information
    and, if not found, platform specific host information to extract the
    ethernet address for a given device.

    Currently this is done with a call to of_get_mac_address() and then
    some ifdef'd stuff for SPARC.

    Consolidate this into a portable routine, and provide the
    arch_get_platform_mac_address() weak function hook for all
    architectures to implement if they want.

    Signed-off-by: David S. Miller

    David S. Miller
     

06 Jan, 2016

4 commits

  • The LSR instruction cannot be used to perform a zero right shift since a
    0 as the immediate value (imm5) in the LSR instruction encoding means
    that a shift of 32 is perfomed. See DecodeIMMShift() in the ARM ARM.

    Make the JIT skip generation of the LSR if a zero-shift is requested.

    This was found using american fuzzy lop.

    Signed-off-by: Rabin Vincent
    Acked-by: Alexei Starovoitov
    Signed-off-by: David S. Miller

    Rabin Vincent
     
  • The SKF_AD_ALU_XOR_X ancillary is not like the other ancillary data
    instructions since it XORs A with X while all the others replace A with
    some loaded value. All the BPF JITs fail to clear A if this is used as
    the first instruction in a filter. This was found using american fuzzy
    lop.

    Add a helper to determine if A needs to be cleared given the first
    instruction in a filter, and use this in the JITs. Except for ARM, the
    rest have only been compile-tested.

    Fixes: 3480593131e0 ("net: filter: get rid of BPF_S_* enum")
    Signed-off-by: Rabin Vincent
    Acked-by: Daniel Borkmann
    Acked-by: Alexei Starovoitov
    Signed-off-by: David S. Miller

    Rabin Vincent
     
  • …ub/scm/linux/kernel/git/kvalo/wireless-drivers-next

    Kalle Valo says:

    ====================
    brcfmac

    * fix IBSS which got broken over time
    * new USB id for bcm43242 dongle
    * arp offload configuration through inet notifier

    ath9k

    * add random number generator support (CONFIG_ATH9K_HWRNG)

    iwlwifi

    * Make scan parameters low latency aware
    * Fix in the NL80211_FEATURE_FULL_AP_CLIENT_STATE state case
    * Fix enable injection mode (Chaya Rachel)
    * Various cleanups (Dan / Julia / myself)
    * Allow to stay more time on popular channels (David Spinadel)
    * Bug fixes for D0i3 (Eliad / Luca)
    * Fixes for GO uAPSD (myself)
    * Start of TSO support (myself)
    * Rate control bug fixes (Eyal / Gregory)
    * Start the work on 9000 devices (Johannes / Sara / Oren)
    * Start the work on a new Tx queue allocation model (Liad)
    * Debug infrastructure enhancements (Golan)

    mwifiex

    * add a debugfs file for chip reset
    * advertise SMS4 cipher suite
    * increase ap and station interface limit to 3
    * enable MSI support on newer pcie devices (8897 onwards)

    rtlwifi

    * fix lots of module parameter usage
    ====================

    Signed-off-by: David S. Miller <davem@davemloft.net>

    David S. Miller
     
  • Pull tile bugfix from Chris Metcalf:
    "This fixes a bug that Sudip's buildbot found for tilepro allmodconfig.

    I've tagged it for stable only back to 3.19, which was when most of
    the other affected architectures added their support for working
    around this issue"

    * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
    tile: provide CONFIG_PAGE_SIZE_64KB etc for tilepro

    Linus Torvalds
     

05 Jan, 2016

2 commits

  • This allows the build system to know that it can't attempt to
    configure the Lustre virtual block device, for example, when tilepro
    is using 64KB pages (as it does by default). The tilegx build
    already provided those symbols.

    Previously we required that the tilepro hypervisor be rebuilt with
    a different hardcoded page size in its headers, and then Linux be
    rebuilt using the updated hypervisor header. Now we allow each of
    the hypervisor and Linux to be built independently. We still check
    at boot time to ensure that the page size provided by the hypervisor
    matches what Linux expects.

    Signed-off-by: Chris Metcalf
    Cc: stable@vger.kernel.org [3.19+]

    Chris Metcalf
     
  • Expose socket options for setting a classic or extended BPF program
    for use when selecting sockets in an SO_REUSEPORT group. These options
    can be used on the first socket to belong to a group before bind or
    on any socket in the group after bind.

    This change includes refactoring of the existing sk_filter code to
    allow reuse of the existing BPF filter validation checks.

    Signed-off-by: Craig Gallek
    Acked-by: Alexei Starovoitov
    Signed-off-by: David S. Miller

    Craig Gallek
     

04 Jan, 2016

1 commit

  • Pull MIPS build fix from Ralf Baechle:
    "Fix a makefile issue resulting in build breakage with older binutils.

    This has sat in -next for a few days, testers and buildbot are happy
    with it, too though if you are going for another -rc that'd certainly
    help ironing out a few more issues"

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
    MIPS: VDSO: Fix build error with binutils 2.24 and earlier

    Linus Torvalds
     

01 Jan, 2016

4 commits


30 Dec, 2015

6 commits

  • Merge misc fixes from Andrew Morton:
    "9 fixes"

    * emailed patches from Andrew Morton :
    mm/vmstat: fix overflow in mod_zone_page_state()
    ocfs2/dlm: clear migration_pending when migration target goes down
    mm/memory_hotplug.c: check for missing sections in test_pages_in_a_zone()
    ocfs2: fix flock panic issue
    m32r: add io*_rep helpers
    m32r: fix build failure
    arch/x86/xen/suspend.c: include xen/xen.h
    mm: memcontrol: fix possible memcg leak due to interrupted reclaim
    ocfs2: fix BUG when calculate new backup super

    Linus Torvalds
     
  • m32r allmodconfig was failing with the error:

    error: implicit declaration of function 'read'

    On checking io.h it turned out that 'read' is not defined but 'readb' is
    defined and 'ioread8' will then obviously mean 'readb'.

    At the same time some of the helper functions ioreadN_rep() and
    iowriteN_rep() were missing which also led to the build failure.

    Signed-off-by: Sudip Mukherjee
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Sudip Mukherjee
     
  • m32r allmodconfig is failing with:

    In file included from ../include/linux/kvm_para.h:4:0,
    from ../kernel/watchdog.c:26:
    ../include/uapi/linux/kvm_para.h:30:26: fatal error: asm/kvm_para.h: No such file or directory

    kvm_para.h was not included in the build.

    Signed-off-by: Sudip Mukherjee
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Sudip Mukherjee
     
  • Fix the build warning:

    arch/x86/xen/suspend.c: In function 'xen_arch_pre_suspend':
    arch/x86/xen/suspend.c:70:9: error: implicit declaration of function 'xen_pv_domain' [-Werror=implicit-function-declaration]
    if (xen_pv_domain())
    ^

    Reported-by: kbuild test robot
    Cc: Sasha Levin
    Cc: Konrad Rzeszutek Wilk
    Cc: Boris Ostrovsky
    Cc: David Vrabel
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • Commit 2a037f310bab ("MIPS: VDSO: Fix build error") tries to fix a build
    error seen with binutils 2.24 and earlier. However, the fix does not work,
    and again results in the already known build errors if the kernel is built
    with an earlier version of binutils.

    CC arch/mips/vdso/gettimeofday.o
    /tmp/ccnOVbHT.s: Assembler messages:
    /tmp/ccnOVbHT.s:50: Error: can't resolve `_start' {*UND* section} - `L0 {.text section}
    /tmp/ccnOVbHT.s:374: Error: can't resolve `_start' {*UND* section} - `L0 {.text section}
    scripts/Makefile.build:258: recipe for target 'arch/mips/vdso/gettimeofday.o' failed
    make[2]: *** [arch/mips/vdso/gettimeofday.o] Error 1

    Fixes: 2a037f310bab ("MIPS: VDSO: Fix build error")
    Cc: Qais Yousef
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/11926/
    Signed-off-by: Guenter Roeck
    Signed-off-by: Ralf Baechle

    Guenter Roeck
     
  • Cc: stable@vger.kernel.org # 3.15+
    Reviewed-by: Jeff Layton
    Signed-off-by: Al Viro

    Al Viro
     

28 Dec, 2015

4 commits

  • This is a new device driver for a high performance SR-IOV assisted virtual
    network for IBM System p and IBM System i systems. The SR-IOV VF will be
    attached to the VIOS partition and mapped to the Linux client via the
    hypervisor's VNIC protocol that this driver implements.

    This driver is able to perform basic tx and rx, new features
    and improvements will be added as they are being developed and tested.

    Signed-off-by: Thomas Falcon
    Signed-off-by: John Allen
    Signed-off-by: David S. Miller

    Thomas Falcon
     
  • Pull MIPS fixes from Ralf Baechle:

    - Fix bitrot in __get_user_unaligned()
    - EVA userspace accessor bug fixes.
    - Fix for build issues with certain toolchains.
    - Fix build error for VDSO with particular toolchain versions.
    - Fix build error due to a variable that should have been removed by an
    earlier patch

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
    MIPS: Fix bitrot in __get_user_unaligned()
    MIPS: Fix build error due to unused variables.
    MIPS: VDSO: Fix build error
    MIPS: CPS: drop .set mips64r2 directives
    MIPS: uaccess: Take EVA into account in [__]clear_user
    MIPS: uaccess: Take EVA into account in __copy_from_user()
    MIPS: uaccess: Fix strlen_user with EVA

    Linus Torvalds
     
  • Pull ARM SoC fixes from Olof Johansson:
    "A smallish set of fixes that we've been sitting on for a while now,
    flushing the queue here so they go in. Summary:

    A handful of fixes for OMAP, i.MX, Allwinner and Tegra:

    - A clock rate and a PHY setup fix for i.MX6Q/DL
    - A couple of fixes for the reduced serial bus (sunxi-rsb) on
    Allwinner
    - UART wakeirq fix for an OMAP4 board, timer config fixes for AM43XX.
    - Suspend fix for Tegra124 Chromebooks
    - Fix for missing implicit include that's different between
    ARM/ARM64"

    * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: tegra: Fix suspend hang on Tegra124 Chromebooks
    bus: sunxi-rsb: Fix peripheral IC mapping runtime address
    bus: sunxi-rsb: Fix primary PMIC mapping hardware address
    ARM: dts: Fix UART wakeirq for omap4 duovero parlor
    ARM: OMAP2+: AM43xx: select ARM TWD timer
    ARM: OMAP2+: am43xx: enable GENERIC_CLOCKEVENTS_BROADCAST
    fsl-ifc: add missing include on ARM64
    ARM: dts: imx6: Fix Ethernet PHY mode on Ventana boards
    ARM: dts: imx: Fix the assigned-clock mismatch issue on imx6q/dl
    bus: sunxi-rsb: unlock on error in sunxi_rsb_read()
    ARM: dts: sunxi: sun6i-a31s-primo81.dts: add touchscreen axis swapping property

    Linus Torvalds
     
  • Signed-off-by: Al Viro
    Signed-off-by: Ralf Baechle

    Al Viro
     

27 Dec, 2015

1 commit

  • Pull ARC fixes from Vineet Gupta:
    "Sorry for this late pull request, but these are all important fixes
    for code introduced/updated in this release which we will otherwise
    end up back porting.

    - Unwinder rework (A revert followed by better fix)
    - Build errors: MMUv2, modules with -Os
    - highmem section mismatch build splat"

    * tag 'arc-4.4-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
    ARC: dw2 unwind: Catch Dwarf SNAFUs early
    ARC: dw2 unwind: Don't bail for CIE.version != 1
    Revert "ARC: dw2 unwind: Ignore CIE version !=1 gracefully instead of bailing"
    ARC: Fix linking errors with CONFIG_MODULE + CONFIG_CC_OPTIMIZE_FOR_SIZE
    ARC: mm: fix building for MMU v2
    ARC: mm: HIGHMEM: Fix section mismatch splat

    Linus Torvalds
     

26 Dec, 2015

2 commits

  • Pull parisc system call restart fix from Helge Deller:
    "The architectural design of parisc always uses two instructions to
    call kernel syscalls (delayed branch feature). This means that the
    instruction following the branch (located in the delay slot of the
    branch instruction) is executed before control passes to the branch
    destination.

    Depending on which assembler instruction and how it is used in
    usersapce in the delay slot, this sometimes made restarted syscalls
    like futex() and poll() failing with -ENOSYS"

    * 'parisc-4.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
    parisc: Fix syscall restarts

    Linus Torvalds
     
  • Pull sparc fixes from David Miller:

    1) Finally make perf stack backtraces stable on sparc, several problems
    (mostly due to the context in which the user copies from the stack
    are done) contributed to this.

    From Rob Gardner.

    2) Export ADI capability if the cpu supports it.

    3) Hook up userfaultfd system call.

    4) When faults happen during user copies we really have to clean up and
    restore the FPU state fully. Also from Rob Gardner

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
    tty/serial: Skip 'NULL' char after console break when sysrq enabled
    sparc64: fix FP corruption in user copy functions
    sparc64: Perf should save/restore fault info
    sparc64: Ensure perf can access user stacks
    sparc64: Don't set %pil in rtrap_nmi too early
    sparc64: Add ADI capability to cpu capabilities
    tty: serial: constify sunhv_ops structs
    sparc: Hook up userfaultfd system call

    Linus Torvalds
     

25 Dec, 2015

5 commits

  • Short story: Exception handlers used by some copy_to_user() and
    copy_from_user() functions do not diligently clean up floating point
    register usage, and this can result in a user process seeing invalid
    values in floating point registers. This sometimes makes the process
    fail.

    Long story: Several cpu-specific (NG4, NG2, U1, U3) memcpy functions
    use floating point registers and VIS alignaddr/faligndata to
    accelerate data copying when source and dest addresses don't align
    well. Linux uses a lazy scheme for saving floating point registers; It
    is not done upon entering the kernel since it's a very expensive
    operation. Rather, it is done only when needed. If the kernel ends up
    not using FP regs during the course of some trap or system call, then
    it can return to user space without saving or restoring them.

    The various memcpy functions begin their FP code with VISEntry (or a
    variation thereof), which saves the FP regs. They conclude their FP
    code with VISExit (or a variation) which essentially marks the FP regs
    "clean", ie, they contain no unsaved values. fprs.FPRS_FEF is turned
    off so that a lazy restore will be triggered when/if the user process
    accesses floating point regs again.

    The bug is that the user copy variants of memcpy, copy_from_user() and
    copy_to_user(), employ an exception handling mechanism to detect faults
    when accessing user space addresses, and when this handler is invoked,
    an immediate return from the function is forced, and VISExit is not
    executed, thus leaving the fprs register in an indeterminate state,
    but often with fprs.FPRS_FEF set and one or more dirty bits. This
    results in a return to user space with invalid values in the FP regs,
    and since fprs.FPRS_FEF is on, no lazy restore occurs.

    This bug affects copy_to_user() and copy_from_user() for NG4, NG2,
    U3, and U1. All are fixed by using a new exception handler for those
    loads and stores that are done during the time between VISEnter and
    VISExit.

    n.b. In NG4memcpy, the problematic code can be triggered by a copy
    size greater than 128 bytes and an unaligned source address. This bug
    is known to be the cause of random user process memory corruptions
    while perf is running with the callgraph option (ie, perf record -g).
    This occurs because perf uses copy_from_user() to read user stacks,
    and may fault when it follows a stack frame pointer off to an
    invalid page. Validation checks on the stack address just obscure
    the underlying problem.

    Signed-off-by: Rob Gardner
    Signed-off-by: Dave Aldridge
    Signed-off-by: David S. Miller

    Rob Gardner
     
  • There have been several reports of random processes being killed with
    a bus error or segfault during userspace stack walking in perf. One
    of the root causes of this problem is an asynchronous modification to
    thread_info fault_address and fault_code, which stems from a perf
    counter interrupt arriving during kernel processing of a "benign"
    fault, such as a TSB miss. Since perf_callchain_user() invokes
    copy_from_user() to read user stacks, a fault is not only possible,
    but probable. Validity checks on the stack address merely cover up the
    problem and reduce its frequency.

    The solution here is to save and restore fault_address and fault_code
    in perf_callchain_user() so that the benign fault handler is not
    disturbed by a perf interrupt.

    Signed-off-by: Rob Gardner
    Signed-off-by: Dave Aldridge
    Signed-off-by: David S. Miller

    Rob Gardner
     
  • When an interrupt (such as a perf counter interrupt) is delivered
    while executing in user space, the trap entry code puts ASI_AIUS in
    %asi so that copy_from_user() and copy_to_user() will access the
    correct memory. But if a perf counter interrupt is delivered while the
    cpu is already executing in kernel space, then the trap entry code
    will put ASI_P in %asi, and this will prevent copy_from_user() from
    reading any useful stack data in either of the perf_callchain_user_X
    functions, and thus no user callgraph data will be collected for this
    sample period. An additional problem is that a fault is guaranteed
    to occur, and though it will be silently covered up, it wastes time
    and could perturb state.

    In perf_callchain_user(), we ensure that %asi contains ASI_AIUS
    because we know for a fact that the subsequent calls to
    copy_from_user() are intended to read the user's stack.

    [ Use get_fs()/set_fs() -DaveM ]

    Signed-off-by: Rob Gardner
    Signed-off-by: Dave Aldridge
    Signed-off-by: David S. Miller

    Rob Gardner
     
  • Commit 28a1f53 delays setting %pil to avoid potential
    hardirq stack overflow in the common rtrap_irq path.
    Setting %pil also needs to be delayed in the rtrap_nmi
    path for the same reason.

    Signed-off-by: Rob Gardner
    Signed-off-by: Dave Aldridge
    Signed-off-by: David S. Miller

    Rob Gardner
     
  • Add ADI (Application Data Integrity) capability to cpu capabilities list.
    ADI capability allows virtual addresses to be encoded with a tag in
    bits 63-60. This tag serves as an access control key for the regions
    of virtual address with ADI enabled and a key set on them. Hypervisor
    encodes this capability as "adp" in "hwcap-list" property in machine
    description.

    Signed-off-by: Khalid Aziz
    Signed-off-by: David S. Miller

    Khalid Aziz
     

24 Dec, 2015

1 commit


23 Dec, 2015

6 commits

  • Pull kvm fixes from Paolo Bonzini:

    - A series of fixes to the MTRR emulation, tested in the BZ by several
    users so they should be safe this late

    - A fix for a division by zero

    - Two very simple ARM and PPC fixes

    * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
    KVM: x86: Reload pit counters for all channels when restoring state
    KVM: MTRR: treat memory as writeback if MTRR is disabled in guest CPUID
    KVM: MTRR: observe maxphyaddr from guest CPUID, not host
    KVM: MTRR: fix fixed MTRR segment look up
    KVM: VMX: Fix host initiated access to guest MSR_TSC_AUX
    KVM: arm/arm64: vgic: Fix kvm_vgic_map_is_active's dist check
    kvm: x86: move tracepoints outside extended quiescent state
    KVM: PPC: Book3S HV: Prohibit setting illegal transaction state in MSR

    Linus Torvalds
     
  • Pull s390 fixes from Martin Schwidefsky:
    "Two late bug fixes for kernel 4.4.

    Merry Christmas"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
    s390/dis: Fix handling of format specifiers
    s390/zcrypt: Fix AP queue handling if queue is full

    Linus Torvalds
     
  • Enabling CPUFreq support for Tegra124 Chromebooks is causing the Tegra124
    to hang when resuming from suspend.

    When CPUFreq is enabled, the CPU clock is changed from the PLLX clock to
    the DFLL clock during kernel boot. When resuming from suspend the CPU
    clock is temporarily changed back to the PLLX clock before switching back
    to the DFLL. If the DFLL is operating at a much lower frequency than the
    PLLX when we enter suspend, and so the CPU voltage rail is at a voltage
    too low for the CPUs to operate at the PLLX frequency, then the device
    will hang.

    Please note that the PLLX is used in the resume sequence to switch the CPU
    clock from the very slow 32K clock to a faster clock during early resume
    to speed up the resume sequence before the DFLL is resumed.

    Ideally, we should fix this by setting the suspend frequency so that it
    matches the PLLX frequency, however, that would be a bigger change. For
    now simply disable CPUFreq support for Tegra124 Chromebooks to avoid the
    hang when resuming from suspend.

    Fixes: 9a0baee960a7 ("ARM: tegra: Enable CPUFreq support for Tegra124
    Chromebooks")

    Signed-off-by: Jon Hunter
    Signed-off-by: Olof Johansson

    Jon Hunter
     
  • Fix a pointer cast typo introduced in v4.4-rc5 especially visible for
    the i386 subarchitecture where it results in a kernel crash.

    [ Also removed pointless cast as per Al Viro - Linus ]

    Fixes: 8090bfd2bb9a ("um: Fix fpstate handling")
    Signed-off-by: Mickaël Salaün
    Cc: Jeff Dike
    Acked-by: Richard Weinberger
    Signed-off-by: Linus Torvalds

    Mickaël Salaün
     
  • …/git/tmlind/linux-omap into fixes

    Few fixes for omaps to allow am437x only builds to boot properly with
    CPU_IDLE and ARM TWD timer. This is probably a common configuration setup
    for people making products with these SoCs so let's make sure it works.

    Also a wakeirq fix for duovero parlor making my life a bit easier as that
    allows me to run basic PM regression tests on it.

    It would be nice to have these in v4.4, but if it gets too late for that
    because of the holidays, it is not super critical if these get merged for
    v4.5.

    * tag 'omap-for-v4.4/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: dts: Fix UART wakeirq for omap4 duovero parlor
    ARM: OMAP2+: AM43xx: select ARM TWD timer
    ARM: OMAP2+: am43xx: enable GENERIC_CLOCKEVENTS_BROADCAST

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

    Olof Johansson
     
  • …wnguo/linux into fixes

    The i.MX fixes for 4.4, 3rd round:
    - Fix Ethernet PHY mode on i.MX6 Ventana boards, which can result in
    a non-functional Ethernet when Marvell phy driver rather than generic
    phy driver is selected.
    - Fix an assigned-clock configuration bug on imx6qdl-sabreauto board
    which was introduced by commit ed339363de1b ("ARM: dts:
    imx6qdl-sabreauto: Allow HDMI and LVDS to work simultaneously").

    * tag 'imx-fixes-4.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
    ARM: dts: imx6: Fix Ethernet PHY mode on Ventana boards
    ARM: dts: imx: Fix the assigned-clock mismatch issue on imx6q/dl

    Olof Johansson