1. 23 Aug, 2018 6 commits
    • Linus Torvalds's avatar
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · ee090756
      Linus Torvalds authored
      Pull ARM SoC defconfig updates from Olof Johansson:
       "We keep these separate since some files are shared and conflict-prone,
        but there isn't really much to write about here.
      
        Some of the churnier pieces is for the Aspeed platforms, which did an
        overdue refresh of the defconfig, and enabled USB gadget and some
        drivers from there. Most of the rest are minor additions here and
        there to turn on drivers that are needed or useful on the various
        platforms"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
        ARM: multi_v7_defconfig: add CONFIG_UNIPHIER_THERMAL and CONFIG_SNI_AVE
        ARM: config: aspeed: Enable new FSI drivers
        ARM: config: multi_v5: Enable ASPEED drivers
        ARM: config: multi_v5: Refresh configuration
        ARM: config: aspeed: Update defconfig
        ARM: multi_v7_defconfig: Enable support for RZN1D-DB
        ARM: shmobile: defconfig: Disable /sbin/hotplug fork-bomb
        ARM: shmobile: defconfig: Enable support for RZN1D-DB
        ARM: shmobile: defconfig: Enable reset controller support
        ARM: shmobile: defconfig: Drop NET_VENDOR_<FOO>=n
        arm64: defconfig: Enable more peripherals for Samsung Chromebook Plus.
        arm64: defconfig: Enable CONFIG_MTD_NAND_QCOM for IPQ8074
        ARM: qcom_defconfig: Enable QCOM NAND related configs
        ARM: imx_v6_v7_defconfig: add DMATEST support
        ARM: mvebu_v7_defconfig: enable SFP support
        ARM: mvebu_v7_defconfig: sync defconfig
        ARM: multi_v7_defconfig: Add Marvell NAND controller support
        arm: configs: Add USB gadget to Aspeed G5 defconfig
        arm: configs: Add USB gadget to Aspeed G4 defconfig
        arm64: defconfig: enable HiSilicon PMU driver
        ...
      ee090756
    • Linus Torvalds's avatar
      Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f3ea4962
      Linus Torvalds authored
      Pull ARM SoC driver updates from Olof Johansson:
       "Some of the larger changes this merge window:
      
         - Removal of drivers for Exynos5440, a Samsung SoC that never saw
           widespread use.
      
         - Uniphier support for USB3 and SPI reset handling
      
         - Syste control and SRAM drivers and bindings for Allwinner platforms
      
         - Qualcomm AOSS (Always-on subsystem) reset controller drivers
      
         - Raspberry Pi hwmon driver for voltage
      
         - Mediatek pwrap (pmic) support for MT6797 SoC"
      
      * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (52 commits)
        drivers/firmware: psci_checker: stash and use topology_core_cpumask for hotplug tests
        soc: fsl: cleanup Kconfig menu
        soc: fsl: dpio: Convert DPIO documentation to .rst
        staging: fsl-mc: Remove remaining files
        staging: fsl-mc: Move DPIO from staging to drivers/soc/fsl
        staging: fsl-dpaa2: eth: move generic FD defines to DPIO
        soc: fsl: qe: gpio: Add qe_gpio_set_multiple
        usb: host: exynos: Remove support for Exynos5440
        clk: samsung: Remove support for Exynos5440
        soc: sunxi: Add the A13, A23 and H3 system control compatibles
        reset: uniphier: add reset control support for SPI
        cpufreq: exynos: Remove support for Exynos5440
        ata: ahci-platform: Remove support for Exynos5440
        soc: imx6qp: Use GENPD_FLAG_ALWAYS_ON for PU errata
        soc: mediatek: pwrap: add mt6351 driver for mt6797 SoCs
        soc: mediatek: pwrap: add pwrap driver for mt6797 SoCs
        soc: mediatek: pwrap: fix cipher init setting error
        dt-bindings: pwrap: mediatek: add pwrap support for MT6797
        reset: uniphier: add USB3 core reset control
        dt-bindings: reset: uniphier: add USB3 core reset support
        ...
      f3ea4962
    • Linus Torvalds's avatar
      Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 9e259f93
      Linus Torvalds authored
      Pull ARM 32-bit SoC platform updates from Olof Johansson:
       "Most of the SoC updates in this cycle are cleanups and moves to more
        modern infrastructure:
      
         - Davinci was moved to common clock framework
      
         - OMAP1-based Amstrad E3 "Superphone" saw a bunch of cleanups to the
           keyboard interface (bitbanged AT keyboard via GPIO).
      
         - Removal of some stale code for Renesas platforms
      
         - Power management improvements for i.MX6LL"
      
      * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (112 commits)
        ARM: uniphier: select RESET_CONTROLLER
        arm64: uniphier: select RESET_CONTROLLER
        ARM: uniphier: remove empty Makefile
        ARM: exynos: Clear global variable on init error path
        ARM: exynos: Remove outdated maintainer information
        ARM: shmobile: Always enable ARCH_TIMER on SoCs with A7 and/or A15
        ARM: shmobile: r8a7779: hide unused r8a7779_platform_cpu_kill
        soc: r9a06g032: don't build SMP files for non-SMP config
        ARM: shmobile: Add the R9A06G032 SMP enabler driver
        ARM: at91: pm: configure wakeup sources for ULP1 mode
        ARM: at91: pm: add PMC fast startup registers defines
        ARM: at91: pm: Add ULP1 mode support
        ARM: at91: pm: Use ULP0 naming instead of slow clock
        ARM: hisi: handle of_iomap and fix missing of_node_put
        ARM: hisi: check of_iomap and fix missing of_node_put
        ARM: hisi: fix error handling and missing of_node_put
        ARM: mx5: Set the DBGEN bit in ARM_GPC register
        ARM: imx51: Configure M4IF to avoid visual artifacts
        ARM: imx: call imx6sx_cpuidle_init() conditionally for 6sll
        ARM: imx: fix i.MX6SLL build
        ...
      9e259f93
    • Linus Torvalds's avatar
      Merge tag 'riscv-for-linus-4.19-mw1' of... · 5563ae9b
      Linus Torvalds authored
      Merge tag 'riscv-for-linus-4.19-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux
      
      Pull RISC-V fixes from Palmer Dabbelt:
       "This contains a pair of fixes to the RISC-V port:
      
         - The removal of our compat.h, which didn't do anything.
      
         - Fixes to sys_riscv_flush_icache to ensure it actually shows up.
      
           We're going to just call this a bug in the ABI, as it was always
           supposed to be there.
      
        I've given these a simple build+boot test, both individually and as
        the actual tag"
      
      * tag 'riscv-for-linus-4.19-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
        riscv: Delete asm/compat.h
        RISC-V: Don't use a global include guard for uapi/asm/syscalls.h
        RISC-V: Define sys_riscv_flush_icache when SMP=n
      5563ae9b
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 452938cb
      Linus Torvalds authored
      Pull tracing fixes from Steven Rostedt:
       "Masami found an off by one bug in the code that keeps "notrace"
        functions from being traced by kprobes. During my testing, I found
        that there's places that we may want to add kprobes to notrace, thus
        we may end up changing this code before 4.19 is released.
      
        The history behind this change is that we found that adding kprobes to
        various notrace functions caused the kernel to crashed. We took the
        safe route and decided not to allow kprobes to trace any notrace
        function.
      
        But because notrace is added to functions that just cause weird side
        effects to the function tracer, but are still safe, preventing kprobes
        for all notrace functios may be too much of a big hammer.
      
        One such place is __schedule() is marked notrace, to keep function
        tracer from doing strange recursive loops when it gets traced with
        NEED_RESCHED set. With this change, one can not add kprobes to the
        scheduler.
      
        Masami also added code to use gcov on ftrace"
      
      * tag 'trace-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing/kprobes: Fix to check notrace function with correct range
        tracing: Allow gcov profiling on only ftrace subsystem
      452938cb
    • Nick Desaulniers's avatar
      include/linux/compiler*.h: make compiler-*.h mutually exclusive · 815f0ddb
      Nick Desaulniers authored
      Commit cafa0010 ("Raise the minimum required gcc version to 4.6")
      recently exposed a brittle part of the build for supporting non-gcc
      compilers.
      
      Both Clang and ICC define __GNUC__, __GNUC_MINOR__, and
      __GNUC_PATCHLEVEL__ for quick compatibility with code bases that haven't
      added compiler specific checks for __clang__ or __INTEL_COMPILER.
      
      This is brittle, as they happened to get compatibility by posing as a
      certain version of GCC.  This broke when upgrading the minimal version
      of GCC required to build the kernel, to a version above what ICC and
      Clang claim to be.
      
      Rather than always including compiler-gcc.h then undefining or
      redefining macros in compiler-intel.h or compiler-clang.h, let's
      separate out the compiler specific macro definitions into mutually
      exclusive headers, do more proper compiler detection, and keep shared
      definitions in compiler_types.h.
      
      Fixes: cafa0010 ("Raise the minimum required gcc version to 4.6")
      Reported-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Suggested-by: default avatarEli Friedman <efriedma@codeaurora.org>
      Suggested-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarNick Desaulniers <ndesaulniers@google.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      815f0ddb
  2. 22 Aug, 2018 34 commits