1. 31 Mar, 2017 1 commit
    • Arnd Bergmann's avatar
      Merge tag 'arm-soc/for-4.12/soc' of http://github.com/Broadcom/stblinux into next/soc · b69bad75
      Arnd Bergmann authored
      Pull "Broadcom soc changes for 4.12" from Florian Fainelli:
      
      This pull request contains Broadcom ARM-based SoC Kconfig/platform changes for
      4.12, please pull the following:
      
      - Al enables ZONE_DMA for BRCMSTB platforms since a bunch of on-chip
        peripherals such as USB (OHCI and EHCI) and SDHCI cannot support physical
        addresses > 32-bit. This is only required when ARM_LPAE is enabled
      
      - Danesh enables ARCH_HAS_HOLES_MEMORYMODEL in order for the kernel to provide
        a pfn_valid() implementation despite BRCMSTB enabling the SPARSEMEM model by
        default.
      
      - Florian adds support for a new 28nm generation chip: 7260 by updating the
        runtime detection UART debuggin stub used for DEBUG_LL.
      
      * tag 'arm-soc/for-4.12/soc' of http://github.com/Broadcom/stblinux:
        ARM: brcmstb: Add entry for 7260
        ARM: brcmstb: Enable ARCH_HAS_HOLES_MEMORYMODEL
        ARM: brcmstb: Enable ZONE_DMA for non 64-bit capable peripherals
      b69bad75
  2. 30 Mar, 2017 3 commits
    • Arnd Bergmann's avatar
      Merge tag 'gemini-multiplat-2' of... · 88f31b1d
      Arnd Bergmann authored
      Merge tag 'gemini-multiplat-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/soc
      
      Pull "Gemini multiplatform updates" from Linus Walleij:
      
      - Select the poweroff driver so the system can properly shut down.
        This driver is merged in the power tree.
      - Select the right Faraday GPIO block (we renamed it).
      - Do not select SERIAL_OF_PLATFORM that just create Kconfig
        warnings on us. We'll put that into the defconfig instead.
      
      * tag 'gemini-multiplat-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
        ARM: gemini: don't select SERIAL_OF_PLATFORM
        ARM: gemini: select the right GPIO block
        ARM: gemini: select gemini poweroff
      88f31b1d
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v4.12/soc-v2-signed' of... · 59bc516c
      Arnd Bergmann authored
      Merge tag 'omap-for-v4.12/soc-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
      
      Pull "SoC changes for omaps for v4.12 merge window" from Tony Lindgren:
      
      - Drop PM_SUSPEND_STANDBY
      
      - Clean up hwmod code in preparation to eventually dynamically
        allocating hwmod data based on device tree data
      
      - Implement hwmod workaround for dra7 DCAN1 and OTG module to prevent
        clockdomain from entering HW_AUTO
      
      - Configure clockdomain and hwmod for dm81xx SATA
      
      - Mark omap_init_rng as __init
      
      * tag 'omap-for-v4.12/soc-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: mark omap_init_rng as __init
        ARM: OMAP2+: dm81xx: Add clkdm and hwmod for SATA
        ARM: DRA7: hwmod_data: Prevent wait_target_disable error for usb_otg_ss
        ARM: DRA7: hwmod: Fix DCAN1 stuck in transition
        ARM: OMAP2+ hwmod: Allow modules to disable HW_AUTO
        ARM: OMAP2+: omap_hwmod: provide space for more hwmod flags
        ARM: OMAP2+: Make hwmod clkdm_name const
        ARM: OMAP2+: Remove unused CLOCKACT_TEST_ICLK
        ARM: OMAP2+: Use list_for_each_entry for hwmod slave_ports
        ARM: OMAP2+: Remove mostly unused hwmod linkspace
        ARM: OMAP: PM: Drop useless checks for PM_SUSPEND_STANDBY
      59bc516c
    • Arnd Bergmann's avatar
      Merge tag 'davinci-for-v4.12/soc' of... · 2235ac90
      Arnd Bergmann authored
      Merge tag 'davinci-for-v4.12/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
      
      Pull "DaVinci SoC updates for v4.12" from Sekhar Nori:
      
      v4.12 SoC updates for DaVinci include necessary pdata-quirks
      to make video capture and display work on da850.
      
      VPIF driver which supports video capture and display on
      da850 is a legacy driver.  It does not have DT equavalents
      for all things that are used on platform data.
      
      Attempts were made to pass data via DT[1], but linux-media
      does not yet have a good way of describing subdevices in
      device tree. This is work in progress. As soon as bindings
      are defined and implementation is available, we can shift
      to using that. For now we are stuck with using pdata.
      
      The pull request also has some clean-up for PM, and a fix
      for pdata quirks mechanism.
      
      [1] https://marc.info/?l=devicetree&m=147982998517384
      
      * tag 'davinci-for-v4.12/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
        ARM: davinci: add pdata-quirks for da850-evm vpif display
        ARM: da850-evm: add a fixed regulator for the UI board IO expander
        ARM: davinci: da8xx: add pdata-quirks for VPIF capture
        ARM: davinci: da8xx: add OF_DEV_AUXDATA() for vpif
        ARM: davinci: board-da850-evm: add I2C ID for VPIF
        ARM: davinci: allow having multiple pdata-quirks
        ARM: davinci: PM: Drop useless check for PM_SUSPEND_STANDBY
      2235ac90
  3. 28 Mar, 2017 4 commits
  4. 24 Mar, 2017 1 commit
    • Arnd Bergmann's avatar
      ARM: gemini: don't select SERIAL_OF_PLATFORM · 16c86ef7
      Arnd Bergmann authored
      We cannot select the option when SERIAL_8250 is not also set:
      
      warning: (ARCH_GEMINI) selects SERIAL_OF_PLATFORM which has unmet direct dependencies (TTY && HAS_IOMEM && SERIAL_8250 && OF)
      
      This removes the 'select' statement, requiring that users enable the
      option manually. Alternatively, we could make it a conditional
      'select SERIAL_OF_PLATFORM if SERIAL_8250' or also select a handful
      of other symbols that it depends on.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      16c86ef7
  5. 23 Mar, 2017 3 commits
  6. 22 Mar, 2017 1 commit
  7. 18 Mar, 2017 1 commit
    • Linus Walleij's avatar
      ARM: gemini: select gemini poweroff · 1953d4ad
      Linus Walleij authored
      It's especially annoying if the system cannot be properly
      powered down so select the poweroff driver from the Kconfig.
      
      Cc: Janos Laube <janos.dev@gmail.com>
      Cc: Paulius Zaleckas <paulius.zaleckas@gmail.com>
      Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      1953d4ad
  8. 15 Mar, 2017 3 commits
    • Florian Fainelli's avatar
      ARM: brcmstb: Add entry for 7260 · d47b51ad
      Florian Fainelli authored
      BCM7260 has the same UART base address as 7268, order the entries by
      ascending chip number and alias the 7268 definition to the 7260
      definition.
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      d47b51ad
    • Danesh Petigara's avatar
      ARM: brcmstb: Enable ARCH_HAS_HOLES_MEMORYMODEL · 59f181aa
      Danesh Petigara authored
      Due to the brcmstb SoC's memory map, we may have holes in the memory if
      we don't populate the maximum amount of memory supported by e.g: the
      first memory controller which spans either the first 1GiB or first 2GiB
      of memory.
      
      We need to select ARCH_HAS_HOLES_MEMORYMODEL in order to enable
      CONFIG_HAVE_ARCH_PFN_VALID on platforms that have CONFIG_SPARSEMEM
      enabled.
      Signed-off-by: default avatarDanesh Petigara <danesh.petigara@broadcom.com>
      [florian: Detailed commit message]
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      59f181aa
    • Al Cooper's avatar
      ARM: brcmstb: Enable ZONE_DMA for non 64-bit capable peripherals · 3c51b9c7
      Al Cooper authored
      Some Host Controller hardware blocks, like the OHCI, EHCI and SDIO
      controllers, have hardware blocks that are not capable of doing 64 bit
      DMA. These host controllers fail on boards with >3GB of memory because
      the memory above 3GB is located physically >= 0x100000000 and can only
      be accessed using 64 DMA. The way Linux is currently configured for
      BRCMSTB systems, the memory given to drivers for DMA through functions
      like dma_alloc_coherent() comes from CMA memory and CMA memory is taken
      from the top of physical memory. When these drivers get a DMA buffer
      with an address >=0x100000000, they end up dropping the upper 32 bit of
      the address causing the hardware to DMA to incorrect memory, typically
      BMEM (custom memory carveout). This issue was discovered on a
      BCM97449SSV_DDR4 system with 4GB or memory.
      
      The fix is to enable CONFIG_ZONE_DMA. On ARM systems this makes sure
      that all DMA memory is located within the first 32 bits of address
      space.
      Signed-off-by: default avatarAl Cooper <alcooperx@gmail.com>
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      3c51b9c7
  9. 14 Mar, 2017 4 commits
  10. 13 Mar, 2017 1 commit
  11. 12 Mar, 2017 11 commits
    • Linus Torvalds's avatar
      Linux 4.11-rc2 · 4495c08e
      Linus Torvalds authored
      4495c08e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 56b24d1b
      Linus Torvalds authored
      Pull s390 fixes from Martin Schwidefsky:
      
       - four patches to get the new cputime code in shape for s390
      
       - add the new statx system call
      
       - a few bug fixes
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390: wire up statx system call
        KVM: s390: Fix guest migration for huge guests resulting in panic
        s390/ipl: always use load normal for CCW-type re-IPL
        s390/timex: micro optimization for tod_to_ns
        s390/cputime: provide archicture specific cputime_to_nsecs
        s390/cputime: reset all accounting fields on fork
        s390/cputime: remove last traces of cputime_t
        s390: fix in-kernel program checks
        s390/crypt: fix missing unlock in ctr_paes_crypt on error path
      56b24d1b
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5a45a5a8
      Linus Torvalds authored
      Pull x86 fixes from Thomas Gleixner:
      
       - a fix for the kexec/purgatory regression which was introduced in the
         merge window via an innocent sparse fix. We could have reverted that
         commit, but on deeper inspection it turned out that the whole
         machinery is neither documented nor robust. So a proper cleanup was
         done instead
      
       - the fix for the TLB flush issue which was discovered recently
      
       - a simple typo fix for a reboot quirk
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/tlb: Fix tlb flushing when lguest clears PGE
        kexec, x86/purgatory: Unbreak it and clean it up
        x86/reboot/quirks: Fix typo in ASUS EeeBook X205TA reboot quirk
      5a45a5a8
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ecade114
      Linus Torvalds authored
      Pull irq fixes from Thomas Gleixner:
      
       - a workaround for a GIC erratum
      
       - a missing stub function for CONFIG_IRQDOMAIN=n
      
       - fixes for a couple of type inconsistencies
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip/crossbar: Fix incorrect type of register size
        irqchip/gicv3-its: Add workaround for QDF2400 ITS erratum 0065
        irqdomain: Add empty irq_domain_check_msi_remap
        irqchip/crossbar: Fix incorrect type of local variables
      ecade114
    • Linus Walleij's avatar
      ARM: gemini: convert to ARMv4 multiplatform · 6dbb708a
      Linus Walleij authored
      This converts the Gemini platform to ARMv4 multiplatform, deleting
      the local <mach/*> include directory, moving an idiomatic local
      idling function into the .machine_init() call and getting rid of
      the Makefile.boot finally.
      
      Cc: Janos Laube <janos.dev@gmail.com>
      Cc: Paulius Zaleckas <paulius.zaleckas@gmail.com>
      Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      6dbb708a
    • Linus Walleij's avatar
      ARM: gemini: select ARM_PATCH_PHYS_VIRT and AUTO_ZRELADDR · 8e39061e
      Linus Walleij authored
      This platform survives physical to virtual patching
      without any hickups, and can use AUTO_ZRELADDR.
      We still need to keep Makefile.boot but it is now empty.
      
      Cc: Janos Laube <janos.dev@gmail.com>
      Cc: Paulius Zaleckas <paulius.zaleckas@gmail.com>
      Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      8e39061e
    • Linus Walleij's avatar
      ARM: gemini: switch to sparse IRQs · 46abf938
      Linus Walleij authored
      There is no boardfiles or anything else using the fixed IRQs
      anymore, switch the platform to use sparse IRQs and delete
      the <mach/irqs.h> header.
      
      Cc: Janos Laube <janos.dev@gmail.com>
      Cc: Paulius Zaleckas <paulius.zaleckas@gmail.com>
      Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      46abf938
    • Linus Walleij's avatar
      ARM: gemini: delete all boardfiles · ee149d66
      Linus Walleij authored
      Delete the Gemini boardfiles: we have corresponding, fully-featured
      device trees for all these boards. Delete the referenced include
      files. Delete the local config symbols, especially one for
      "swapped memory", as all supported boards have swapped memory, and
      would a new board be supported this is likely not the right way
      to achieve it anyways. Only the Kconfig options in the central
      arch/arm/Kconfig remains.
      
      Cc: Janos Laube <janos.dev@gmail.com>
      Cc: Paulius Zaleckas <paulius.zaleckas@gmail.com>
      Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      ee149d66
    • Linus Walleij's avatar
      ARM: gemini: DT for the Cortina Gemini SoC platforms · 41d9830c
      Linus Walleij authored
      This adds initial and compulsory device tree support to the
      Gemini ARMv4 platform.
      
      We are selecting a bunch of "absolute minimals" for getting a working
      system up with just device tree:
      
      - We select USE_OF for natural reasons or nothing works.
      
      - We select CLKSRC_OF and GEMINI_TIMER so we get timekeeping from
        the clocksource.
      
      - We select GPIO_GEMINI because these are used as irqchips, and
        for a generic driver it is not reasonable for those to have to
        select every possible irqchip in the world to work, the platform
        should simply provide the available irqchips.
      
      - We select a UART that can be exprected to work with
        SERIAL_OF_PLATFORM which is the name for an 8250 OF-probed
        serial port.
      
      - We select the syscon-based reset controller: it's not fun when
        "reboot" doesn't work because of Kconfig, so we just select
        POWER_RESET and POWER_RESET_SYSCON.
      
      - We perhaps a bit controversiallt select ARM_APPENDED_DTB, because
        this platform is using the ancient RedBoot, and can *NOT* be
        expected to upgrade its bootloaders. Appended device tree is
        simply how these devices have to work with device tree.
      
      Cc: Janos Laube <janos.dev@gmail.com>
      Cc: Paulius Zaleckas <paulius.zaleckas@gmail.com>
      Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      41d9830c
    • Linus Walleij's avatar
      ARM: gemini: convert to MULTI_IRQ_HANDLER · c12ddfe1
      Linus Walleij authored
      In order to enable device tree boot on this machine we must first
      convert it to runtime-manage its irq handler, so do this.
      
      Cc: Janos Laube <janos.dev@gmail.com>
      Cc: Paulius Zaleckas <paulius.zaleckas@gmail.com>
      Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      c12ddfe1
    • Daniel Borkmann's avatar
      x86/tlb: Fix tlb flushing when lguest clears PGE · 2c4ea6e2
      Daniel Borkmann authored
      Fengguang reported random corruptions from various locations on x86-32
      after commits d2852a22 ("arch: add ARCH_HAS_SET_MEMORY config") and
      9d876e79 ("bpf: fix unlocking of jited image when module ronx not set")
      that uses the former. While x86-32 doesn't have a JIT like x86_64, the
      bpf_prog_lock_ro() and bpf_prog_unlock_ro() got enabled due to
      ARCH_HAS_SET_MEMORY, whereas Fengguang's test kernel doesn't have module
      support built in and therefore never had the DEBUG_SET_MODULE_RONX setting
      enabled.
      
      After investigating the crashes further, it turned out that using
      set_memory_ro() and set_memory_rw() didn't have the desired effect, for
      example, setting the pages as read-only on x86-32 would still let
      probe_kernel_write() succeed without error. This behavior would manifest
      itself in situations where the vmalloc'ed buffer was accessed prior to
      set_memory_*() such as in case of bpf_prog_alloc(). In cases where it
      wasn't, the page attribute changes seemed to have taken effect, leading to
      the conclusion that a TLB invalidate didn't happen. Moreover, it turned out
      that this issue reproduced with qemu in "-cpu kvm64" mode, but not for
      "-cpu host". When the issue occurs, change_page_attr_set_clr() did trigger
      a TLB flush as expected via __flush_tlb_all() through cpa_flush_range(),
      though.
      
      There are 3 variants for issuing a TLB flush: invpcid_flush_all() (depends
      on CPU feature bits X86_FEATURE_INVPCID, X86_FEATURE_PGE), cr4 based flush
      (depends on X86_FEATURE_PGE), and cr3 based flush.  For "-cpu host" case in
      my setup, the flush used invpcid_flush_all() variant, whereas for "-cpu
      kvm64", the flush was cr4 based. Switching the kvm64 case to cr3 manually
      worked fine, and further investigating the cr4 one turned out that
      X86_CR4_PGE bit was not set in cr4 register, meaning the
      __native_flush_tlb_global_irq_disabled() wrote cr4 twice with the same
      value instead of clearing X86_CR4_PGE in the first write to trigger the
      flush.
      
      It turned out that X86_CR4_PGE was cleared from cr4 during init from
      lguest_arch_host_init() via adjust_pge(). The X86_FEATURE_PGE bit is also
      cleared from there due to concerns of using PGE in guest kernel that can
      lead to hard to trace bugs (see bff672e6 ("lguest: documentation V:
      Host") in init()). The CPU feature bits are cleared in dynamic
      boot_cpu_data, but they never propagated to __flush_tlb_all() as it uses
      static_cpu_has() instead of boot_cpu_has() for testing which variant of TLB
      flushing to use, meaning they still used the old setting of the host
      kernel.
      
      Clearing via setup_clear_cpu_cap(X86_FEATURE_PGE) so this would propagate
      to static_cpu_has() checks is too late at this point as sections have been
      patched already, so for now, it seems reasonable to switch back to
      boot_cpu_has(X86_FEATURE_PGE) as it was prior to commit c109bf95
      ("x86/cpufeature: Remove cpu_has_pge"). This lets the TLB flush trigger via
      cr3 as originally intended, properly makes the new page attributes visible
      and thus fixes the crashes seen by Fengguang.
      
      Fixes: c109bf95 ("x86/cpufeature: Remove cpu_has_pge")
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Cc: bp@suse.de
      Cc: Kees Cook <keescook@chromium.org>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: netdev@vger.kernel.org
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Cc: Alexei Starovoitov <ast@kernel.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: lkp@01.org
      Cc: Laura Abbott <labbott@redhat.com>
      Cc: stable@vger.kernel.org
      Link: http://lkml.kernrl.org/r/20170301125426.l4nf65rx4wahohyl@wfg-t540p.sh.intel.com
      Link: http://lkml.kernel.org/r/25c41ad9eca164be4db9ad84f768965b7eb19d9e.1489191673.git.daniel@iogearbox.netSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      2c4ea6e2
  12. 11 Mar, 2017 7 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 106e4da6
      Linus Torvalds authored
      Pull KVM fixes from Radim Krčmář:
       "ARM updates from Marc Zyngier:
         - vgic updates:
           - Honour disabling the ITS
           - Don't deadlock when deactivating own interrupts via MMIO
           - Correctly expose the lact of IRQ/FIQ bypass on GICv3
      
         - I/O virtualization:
           - Make KVM_CAP_NR_MEMSLOTS big enough for large guests with many
             PCIe devices
      
         - General bug fixes:
           - Gracefully handle exception generated with syndroms that the host
             doesn't understand
           - Properly invalidate TLBs on VHE systems
      
        x86:
         - improvements in emulation of VMCLEAR, VMX MSR bitmaps, and VCPU
           reset
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: nVMX: do not warn when MSR bitmap address is not backed
        KVM: arm64: Increase number of user memslots to 512
        KVM: arm/arm64: Remove KVM_PRIVATE_MEM_SLOTS definition that are unused
        KVM: arm/arm64: Enable KVM_CAP_NR_MEMSLOTS on arm/arm64
        KVM: Add documentation for KVM_CAP_NR_MEMSLOTS
        KVM: arm/arm64: VGIC: Fix command handling while ITS being disabled
        arm64: KVM: Survive unknown traps from guests
        arm: KVM: Survive unknown traps from guests
        KVM: arm/arm64: Let vcpu thread modify its own active state
        KVM: nVMX: reset nested_run_pending if the vCPU is going to be reset
        kvm: nVMX: VMCLEAR should not cause the vCPU to shut down
        KVM: arm/arm64: vgic-v3: Don't pretend to support IRQ/FIQ bypass
        arm64: KVM: VHE: Clear HCR_TGE when invalidating guest TLBs
      106e4da6
    • Linus Torvalds's avatar
      Merge tag 'extable-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux · 4b050f22
      Linus Torvalds authored
      Pull extable.h fix from Paul Gortmaker:
       "Fixup for arch/score after extable.h introduction.
      
        It seems that Guenter is the only one on the planet doing builds for
        arch/score -- we don't have compile coverage for it in linux-next or
        in the kbuild-bot either. Guenter couldn't even recall where he got
        his toolchain, but was kind enough to share it with me so I could
        validate this change and also add arch/score to my build coverage.
      
        I sat on this a bit in case there was any other fallout in other arch
        dirs, but since this still seems to be the only one, I might as well
        send it on its way"
      
      * tag 'extable-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
        score: Fix implicit includes now failing build after extable change
      4b050f22
    • Linus Torvalds's avatar
      Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · 84c37c16
      Linus Torvalds authored
      Pull random updates from Ted Ts'o:
       "Change get_random_{int,log} to use the CRNG used by /dev/urandom and
        getrandom(2). It's faster and arguably more secure than cut-down MD5
        that we had been using.
      
        Also do some code cleanup"
      
      * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block
        random: convert get_random_int/long into get_random_u32/u64
        random: use chacha20 for get_random_int/long
        random: fix comment for unused random_min_urandom_seed
        random: remove variable limit
        random: remove stale urandom_init_wait
        random: remove stale maybe_reseed_primary_crng
      84c37c16
    • Guenter Roeck's avatar
      score: Fix implicit includes now failing build after extable change · 0acf6119
      Guenter Roeck authored
      After changing from module.h to extable.h, score builds fail with:
      
        arch/score/kernel/traps.c: In function 'do_ri':
        arch/score/kernel/traps.c:248:4: error: implicit declaration of function 'user_disable_single_step'
        arch/score/mm/extable.c: In function 'fixup_exception':
        arch/score/mm/extable.c:32:38: error: dereferencing pointer to incomplete type
        arch/score/mm/extable.c:34:24: error: dereferencing pointer to incomplete type
      
      because extable.h doesn't drag in the same amount of headers as the
      module.h did.  Add in the headers which were implicitly expected.
      
      Fixes: 90858794 ("module.h: remove extable.h include now users have migrated")
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      [PG: tweak commit log; refresh for sched header refactoring.]
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      0acf6119
    • Linus Torvalds's avatar
      Merge tag 'tty-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 434fd635
      Linus Torvalds authored
      Pull tty/serial fixes frpm Greg KH:
       "Here are two bugfixes for tty stuff for 4.11-rc2.
      
        One of them resolves the pretty bad bug in the n_hdlc code that
        Alexander Popov found and fixed and has been reported everywhere. The
        other just fixes a samsung serial driver issue when DMA fails on some
        systems.
      
        Both have been in linux-next with no reported issues"
      
      * tag 'tty-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        serial: samsung: Continue to work if DMA request fails
        tty: n_hdlc: get rid of racy n_hdlc.tbuf
      434fd635
    • Linus Torvalds's avatar
      Merge tag 'staging-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 85298808
      Linus Torvalds authored
      Pull staging driver fixes from Greg KH:
       "Here are two small build warning fixes for some staging drivers that
        Arnd has found on his valiant quest to get the kernel to build
        properly with no warnings.
      
        Both of these have been in linux-next this week and resolve the
        reported issues"
      
      * tag 'staging-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: octeon: remove unused variable
        staging/vc04_services: add CONFIG_OF dependency
      85298808
    • Linus Torvalds's avatar
      Merge tag 'usb-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 46552bf4
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here is a number of different USB fixes for 4.11-rc2.
      
        Seems like there were a lot of unresolved issues that people have been
        finding for this subsystem, and a bunch of good security auditing
        happening as well from Johan Hovold. There's the usual batch of gadget
        driver fixes and xhci issues resolved as well.
      
       All of these have been in linux-next with no reported issues"
      
      * tag 'usb-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (35 commits)
        usb: host: xhci-plat: Fix timeout on removal of hot pluggable xhci controllers
        usb: host: xhci-dbg: HCIVERSION should be a binary number
        usb: xhci: remove dummy extra_priv_size for size of xhci_hcd struct
        usb: xhci-mtk: check hcc_params after adding primary hcd
        USB: serial: digi_acceleport: fix OOB-event processing
        MAINTAINERS: usb251xb: remove reference inexistent file
        doc: dt-bindings: usb251xb: mark reg as required
        usb: usb251xb: dt: add unit suffix to oc-delay and power-on-time
        usb: usb251xb: remove max_{power,current}_{sp,bp} properties
        usb-storage: Add ignore-residue quirk for Initio INIC-3619
        USB: iowarrior: fix NULL-deref in write
        USB: iowarrior: fix NULL-deref at probe
        usb: phy: isp1301: Add OF device ID table
        usb: ohci-at91: Do not drop unhandled USB suspend control requests
        USB: serial: safe_serial: fix information leak in completion handler
        USB: serial: io_ti: fix information leak in completion handler
        USB: serial: omninet: drop open callback
        USB: serial: omninet: fix reference leaks at open
        USB: serial: io_ti: fix NULL-deref in interrupt callback
        usb: dwc3: gadget: make to increment req->remaining in all cases
        ...
      46552bf4