12 Jul, 2018

1 commit

  • Pull char/misc fixes from Greg KH:
    "Here are a few char/misc driver fixes for 4.18-rc5.

    The "largest" stuff here is fixes for the UIO changes in 4.18-rc1 that
    caused breakages for some people. Thanks to Xiubo Li for fixing them
    quickly. Other than that, minor fixes for thunderbolt, vmw_balloon,
    nvmem, mei, ibmasm, and mei drivers. There's also a MAINTAINERS update
    where Rafael is offering to help out with reviewing driver core
    patches.

    All of these have been in linux-next with no reported issues"

    * tag 'char-misc-4.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
    nvmem: Don't let a NULL cell_id for nvmem_cell_get() crash us
    thunderbolt: Notify userspace when boot_acl is changed
    uio: fix crash after the device is unregistered
    uio: change to use the mutex lock instead of the spin lock
    uio: use request_threaded_irq instead
    fpga: altera-cvp: Fix an error handling path in 'altera_cvp_probe()'
    ibmasm: don't write out of bounds in read handler
    MAINTAINERS: Add myself as driver core changes reviewer
    mei: discard messages from not connected client during power down.
    vmw_balloon: fix inflation with batching

    Linus Torvalds
     

11 Jul, 2018

1 commit

  • Pull drm fixes from Dave Airlie:
    "This just contains some etnaviv fixes and a MAINTAINERS update for the
    new drm tree locations"

    * tag 'drm-fixes-2018-07-10' of git://anongit.freedesktop.org/drm/drm:
    MAINTAINERS: update drm tree
    drm/etnaviv: bring back progress check in job timeout handler
    drm/etnaviv: Fix driver unregistering
    drm/etnaviv: Check for platform_device_register_simple() failure

    Linus Torvalds
     

10 Jul, 2018

2 commits

  • Mail to dri-devel went out, linux-next was updated, but we forgot this
    one here.

    Cc: David Airlie
    Signed-off-by: Daniel Vetter
    Acked-by: Alex Deucher
    Acked-by: Rodrigo Vivi
    Signed-off-by: Dave Airlie
    Link: https://patchwork.freedesktop.org/patch/msgid/20180706072842.9009-1-daniel.vetter@ffwll.ch

    Daniel Vetter
     
  • Update my TDA998x HDMI encoder MAINTAINERS entry to include the
    dt-bindings header, and a keyword pattern to catch patches containing
    the DT compatible. Also change the status to "maintained" rather than
    "supported".

    Signed-off-by: Russell King
    Signed-off-by: Linus Torvalds

    Russell King - ARM Linux
     

08 Jul, 2018

1 commit

  • Pull dmaengine fixes from Vinod Koul:
    "We have few odd driver fixes and one email update change for you this
    time:

    - Driver fixes for k3dma (off by one), pl330 (burst residue
    granularity) and omap-dma (incorrect residue_granularity)

    - Sinan's email update"

    * tag 'dmaengine-fix-4.18-rc4' of git://git.infradead.org/users/vkoul/slave-dma:
    dmaengine: k3dma: Off by one in k3_of_dma_simple_xlate()
    dmaengine: pl330: report BURST residue granularity
    MAINTAINERS: Update email-id of Sinan Kaya
    dmaengine: ti: omap-dma: Fix OMAP1510 incorrect residue_granularity

    Linus Torvalds
     

05 Jul, 2018

1 commit


29 Jun, 2018

1 commit


28 Jun, 2018

2 commits

  • Timur Tabi no longer works for Qualcomm, and he now has a kernel.org
    email address, so update MAINTAINERS accordingly.

    Signed-off-by: Timur Tabi
    Signed-off-by: Linus Torvalds

    Timur Tabi
     
  • Pull ARM SoC fixes from Olof Johansson:
    "A handful of fixes, nothing really concerning and most touching
    devicetree files for various platforms.

    I also regenerated the shared multiplatform defconfigs; they have
    drifted quite a bit due to Kconfig changes and reordering, and several
    platform maintainers tried doing the same which resulted in a lot of
    conflict pain -- this way we get everybody onto the same base for next
    merge window"

    * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
    arm64: dts: uniphier: fix widget name of headphone for LD11/LD20 boards
    ARM: dts: Fix SPI node for Arria10
    arm64: dts: stratix10: Fix SPI nodes for Stratix10
    qcom: cmd-db: enforce CONFIG_OF_RESERVED_MEM dependency
    ARM: Always build secure_cntvoff.S on ARM V7 to fix shmobile !SMP build
    ARM: multi_v7_defconfig: renormalize based on recent additions
    arm64: defconfig: renormalize based on recent additions
    arm64: dts: msm8916: fix Coresight ETF graph connections
    arm64: dts: apq8096-db820c: disable uart0 by default
    ARM: dts: imx6sx: fix irq for pcie bridge
    arm64: dts: Stingray: Fix I2C controller interrupt type
    arm64: dts: ns2: Fix PCIe controller interrupt type
    arm64: dts: ns2: Fix I2C controller interrupt type
    arm64: dts: specify 1.8V EMMC capabilities for bcm958742t
    arm64: dts: specify 1.8V EMMC capabilities for bcm958742k
    ARM: dts: Cygnus: Fix PCIe controller interrupt type
    ARM: dts: Cygnus: Fix I2C controller interrupt type
    ARM: dts: BCM5301x: Fix i2c controller interrupt type
    ARM: dts: HR2: Fix interrupt types for i2c and PCIe
    ARM: dts: NSP: Fix PCIe controllers interrupt types
    ...

    Linus Torvalds
     

25 Jun, 2018

1 commit

  • Pull networking fixes from David Miller:

    1) Fix netpoll OOPS in r8169, from Ville Syrjälä.

    2) Fix bpf instruction alignment on powerpc et al., from Eric Dumazet.

    3) Don't ignore IFLA_MTU attribute when creating new ipvlan links. From
    Xin Long.

    4) Fix use after free in AF_PACKET, from Eric Dumazet.

    5) Mis-matched RTNL unlock in xen-netfront, from Ross Lagerwall.

    6) Fix VSOCK loopback on big-endian, from Claudio Imbrenda.

    7) Missing RX buffer offset correction when computing DMA addresses in
    mvneta driver, from Antoine Tenart.

    8) Fix crashes in DCCP's ccid3_hc_rx_send_feedback, from Eric Dumazet.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (34 commits)
    sfc: make function efx_rps_hash_bucket static
    strparser: Corrected typo in documentation.
    qmi_wwan: add support for the Dell Wireless 5821e module
    cxgb4: when disabling dcb set txq dcb priority to 0
    net_sched: remove a bogus warning in hfsc
    net: dccp: switch rx_tstamp_last_feedback to monotonic clock
    net: dccp: avoid crash in ccid3_hc_rx_send_feedback()
    net: Remove depends on HAS_DMA in case of platform dependency
    MAINTAINERS: Add file patterns for dsa device tree bindings
    net: mscc: make sparse happy
    net: mvneta: fix the Rx desc DMA address in the Rx path
    Documentation: e1000: Fix docs build error
    Documentation: e100: Fix docs build error
    Documentation: e1000: Use correct heading adornment
    Documentation: e100: Use correct heading adornment
    ipv6: mcast: fix unsolicited report interval after receiving querys
    vhost_net: validate sock before trying to put its fd
    VSOCK: fix loopback on big-endian systems
    net: ethernet: ti: davinci_cpdma: make function cpdma_desc_pool_create static
    xen-netfront: Update features after registering netdev
    ...

    Linus Torvalds
     

24 Jun, 2018

1 commit

  • Pull x86 fixes from Thomas Gleixner:
    "A set of fixes for x86:

    - Make Xen PV guest deal with speculative store bypass correctly

    - Address more fallout from the 5-Level pagetable handling. Undo an
    __initdata annotation to avoid section mismatch and malfunction
    when post init code would touch the freed variable.

    - Handle exception fixup in math_error() before calling notify_die().
    The reverse call order incorrectly triggers notify_die() listeners
    for soemthing which is handled correctly at the site which issues
    the floating point instruction.

    - Fix an off by one in the LLC topology calculation on AMD

    - Handle non standard memory block sizes gracefully un UV platforms

    - Plug a memory leak in the microcode loader

    - Sanitize the purgatory build magic

    - Add the x86 specific device tree bindings directory to the x86
    MAINTAINER file patterns"

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86/mm: Fix 'no5lvl' handling
    Revert "x86/mm: Mark __pgtable_l5_enabled __initdata"
    x86/CPU/AMD: Fix LLC ID bit-shift calculation
    MAINTAINERS: Add file patterns for x86 device tree bindings
    x86/microcode/intel: Fix memleak in save_microcode_patch()
    x86/platform/UV: Add kernel parameter to set memory block size
    x86/platform/UV: Use new set memory block size function
    x86/platform/UV: Add adjustable set memory block size function
    x86/build: Remove unnecessary preparation for purgatory
    Revert "kexec/purgatory: Add clean-up for purgatory directory"
    x86/xen: Add call of speculative_store_bypass_ht_init() to PV paths
    x86: Call fixup_exception() before notify_die() in math_error()

    Linus Torvalds
     

23 Jun, 2018

2 commits


22 Jun, 2018

1 commit


21 Jun, 2018

1 commit

  • Pull networking fixes from David Miller:

    1) Fix crash on bpf_prog_load() errors, from Daniel Borkmann.

    2) Fix ATM VCC memory accounting, from David Woodhouse.

    3) fib6_info objects need RCU freeing, from Eric Dumazet.

    4) Fix SO_BINDTODEVICE handling for TCP sockets, from David Ahern.

    5) Fix clobbered error code in enic_open() failure path, from
    Govindarajulu Varadarajan.

    6) Propagate dev_get_valid_name() error returns properly, from Li
    RongQing.

    7) Fix suspend/resume in davinci_emac driver, from Bartosz Golaszewski.

    8) Various act_ife fixes (recursive locking, IDR leaks, etc.) from
    Davide Caratti.

    9) Fix buggy checksum handling in sungem driver, from Eric Dumazet.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (40 commits)
    ip: limit use of gso_size to udp
    stmmac: fix DMA channel hang in half-duplex mode
    net: stmmac: socfpga: add additional ocp reset line for Stratix10
    net: sungem: fix rx checksum support
    bpfilter: ignore binary files
    bpfilter: fix build error
    net/usb/drivers: Remove useless hrtimer_active check
    net/sched: act_ife: preserve the action control in case of error
    net/sched: act_ife: fix recursive lock and idr leak
    net: ethernet: fix suspend/resume in davinci_emac
    net: propagate dev_get_valid_name return code
    enic: do not overwrite error code
    net/tcp: Fix socket lookups with SO_BINDTODEVICE
    ptp: replace getnstimeofday64() with ktime_get_real_ts64()
    net/ipv6: respect rcu grace period before freeing fib6_info
    net: net_failover: fix typo in net_failover_slave_register()
    ipvlan: use ETH_MAX_MTU as max mtu
    net: hamradio: use eth_broadcast_addr
    enic: initialize enic->rfs_h.lock in enic_probe
    MAINTAINERS: Add Sam as the maintainer for NCSI
    ...

    Linus Torvalds
     

20 Jun, 2018

2 commits


19 Jun, 2018

4 commits


17 Jun, 2018

2 commits

  • Pull documentation fixes from Mauro Carvalho Chehab:
    "This solves a series of broken links for files under Documentation,
    and improves a script meant to detect such broken links (see
    scripts/documentation-file-ref-check).

    The changes on this series are:

    - can.rst: fix a footnote reference;

    - crypto_engine.rst: Fix two parsing warnings;

    - Fix a lot of broken references to Documentation/*;

    - improve the scripts/documentation-file-ref-check script, in order
    to help detecting/fixing broken references, preventing
    false-positives.

    After this patch series, only 33 broken references to doc files are
    detected by scripts/documentation-file-ref-check"

    * tag 'docs-broken-links' of git://linuxtv.org/mchehab/experimental: (26 commits)
    fix a series of Documentation/ broken file name references
    Documentation: rstFlatTable.py: fix a broken reference
    ABI: sysfs-devices-system-cpu: remove a broken reference
    devicetree: fix a series of wrong file references
    devicetree: fix name of pinctrl-bindings.txt
    devicetree: fix some bindings file names
    MAINTAINERS: fix location of DT npcm files
    MAINTAINERS: fix location of some display DT bindings
    kernel-parameters.txt: fix pointers to sound parameters
    bindings: nvmem/zii: Fix location of nvmem.txt
    docs: Fix more broken references
    scripts/documentation-file-ref-check: check tools/*/Documentation
    scripts/documentation-file-ref-check: get rid of false-positives
    scripts/documentation-file-ref-check: hint: dash or underline
    scripts/documentation-file-ref-check: add a fix logic for DT
    scripts/documentation-file-ref-check: accept more wildcards at filenames
    scripts/documentation-file-ref-check: fix help message
    media: max2175: fix location of driver's companion documentation
    media: v4l: fix broken video4linux docs locations
    media: dvb: point to the location of the old README.dvb-usb file
    ...

    Linus Torvalds
     
  • Pull fbdev updates from Bartlomiej Zolnierkiewicz:
    "There is nothing really major here, few small fixes, some cleanups and
    dead drivers removal:

    - mark omapfb drivers as orphans in MAINTAINERS file (Tomi Valkeinen)

    - add missing module license tags to omap/omapfb driver (Arnd
    Bergmann)

    - add missing GPIOLIB dependendy to omap2/omapfb driver (Arnd
    Bergmann)

    - convert savagefb, aty128fb & radeonfb drivers to use msleep & co.
    (Jia-Ju Bai)

    - allow COMPILE_TEST build for viafb driver (media part was reviewed
    by media subsystem Maintainer)

    - remove unused MERAM support from sh_mobile_lcdcfb and shmob-drm
    drivers (drm parts were acked by shmob-drm driver Maintainer)

    - remove unused auo_k190xfb drivers

    - misc cleanups (Souptick Joarder, Wolfram Sang, Markus Elfring, Andy
    Shevchenko, Colin Ian King)"

    * tag 'fbdev-v4.18' of git://github.com/bzolnier/linux: (26 commits)
    fb_omap2: add gpiolib dependency
    video/omap: add module license tags
    MAINTAINERS: make omapfb orphan
    video: fbdev: pxafb: match_string() conversion fixup
    video: fbdev: nvidia: fix spelling mistake: "scaleing" -> "scaling"
    video: fbdev: fix spelling mistake: "frambuffer" -> "framebuffer"
    video: fbdev: pxafb: Convert to use match_string() helper
    video: fbdev: via: allow COMPILE_TEST build
    video: fbdev: remove unused sh_mobile_meram driver
    drm: shmobile: remove unused MERAM support
    video: fbdev: sh_mobile_lcdcfb: remove unused MERAM support
    video: fbdev: remove unused auo_k190xfb drivers
    video: omap: Improve a size determination in omapfb_do_probe()
    video: sm501fb: Improve a size determination in sm501fb_probe()
    video: fbdev-MMP: Improve a size determination in path_init()
    video: fbdev-MMP: Delete an error message for a failed memory allocation in two functions
    video: auo_k190x: Delete an error message for a failed memory allocation in auok190x_common_probe()
    video: sh_mobile_lcdcfb: Delete an error message for a failed memory allocation in two functions
    video: sh_mobile_meram: Delete an error message for a failed memory allocation in sh_mobile_meram_probe()
    video: fbdev: sh_mobile_meram: Drop SUPERH platform dependency
    ...

    Linus Torvalds
     

16 Jun, 2018

8 commits

  • Pull uml updates from Richard Weinberger:
    "Minor updates for UML:

    - fixes for our new vector network driver by Anton

    - initcall cleanup by Alexander

    - We have a new mailinglist, sourceforge.net sucks"

    * 'for-linus-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
    um: Fix raw interface options
    um: Fix initialization of vector queues
    um: remove uml initcalls
    um: Update mailing list address

    Linus Torvalds
     
  • …nux/kernel/git/palmer/riscv-linux

    Pull RISC-V updates from Palmer Dabbelt:
    "This contains some small RISC-V updates I'd like to target for 4.18.

    They are all fairly small this time. Here's a short summary, there's
    more info in the commits/merges:

    - a fix to __clear_user to respect the passed arguments.

    - enough support for the perf subsystem to work with RISC-V's ISA
    defined performance counters.

    - support for sparse and cleanups suggested by it.

    - support for R_RISCV_32 (a relocation, not the 32-bit ISA).

    - some MAINTAINERS cleanups.

    - the addition of CONFIG_HVC_RISCV_SBI to our defconfig, as it's
    always present.

    I've given these a simple build+boot test"

    * tag 'riscv-for-linus-4.18-merge_window' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
    RISC-V: Add CONFIG_HVC_RISCV_SBI=y to defconfig
    RISC-V: Handle R_RISCV_32 in modules
    riscv/ftrace: Export _mcount when DYNAMIC_FTRACE isn't set
    riscv: add riscv-specific predefines to CHECKFLAGS
    riscv: split the declaration of __copy_user
    riscv: no __user for probe_kernel_address()
    riscv: use NULL instead of a plain 0
    perf: riscv: Add Document for Future Porting Guide
    perf: riscv: preliminary RISC-V support
    MAINTAINERS: Update Albert's email, he's back at Berkeley
    MAINTAINERS: Add myself as a maintainer for SiFive's drivers
    riscv: Fix the bug in memory access fixup code

    Linus Torvalds
     
  • As files got renamed, their references broke.

    Manually fix a series of broken refs at the DT bindings.

    Signed-off-by: Mauro Carvalho Chehab
    Acked-by: Jonathan Corbet

    Mauro Carvalho Chehab
     
  • The specified locations are not right. Fix the wildcard logic
    to point to the correct directories.

    Without that, get-maintainer won't get things right:

    $ ./scripts/get_maintainer.pl --no-git-fallback --no-r --no-n --no-l -f Documentation/devicetree/bindings/arm/cpu-enable-method/nuvoton,npcm750-smp
    robh+dt@kernel.org (maintainer:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS)
    mark.rutland@arm.com (maintainer:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS)

    After the patch, it will properly point to NPCM arch maintainers:
    $ ./scripts/get_maintainer.pl --no-git-fallback --no-r --no-n --no-l -f Documentation/devicetree/bindings/arm/cpu-enable-method/nuvoton,npcm750-smp
    avifishman70@gmail.com (supporter:ARM/NUVOTON NPCM ARCHITECTURE)
    tmaimon77@gmail.com (supporter:ARM/NUVOTON NPCM ARCHITECTURE)
    robh+dt@kernel.org (maintainer:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS)
    mark.rutland@arm.com (maintainer:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS)

    Cc: Avi Fishman
    Cc: Tomer Maimon
    Cc: Patrick Venture
    Cc: Nancy Yuen
    Cc: Brendan Higgins
    Signed-off-by: Mauro Carvalho Chehab
    Acked-by: Jonathan Corbet

    Mauro Carvalho Chehab
     
  • Those files got a manufacturer's name prepended and were moved around.
    Adjust their references accordingly.

    Also, due those movements, Documentation/devicetree/bindings/video
    doesn't exist anymore.

    Cc: David Airlie
    Cc: David Lechner
    Cc: Peter Senna Tschudin
    Cc: Martin Donnelly
    Cc: Martyn Welch
    Cc: Stefan Agner
    Cc: Alison Wang
    Cc: Eric Anholt
    Signed-off-by: Mauro Carvalho Chehab
    Acked-by: Jonathan Corbet

    Mauro Carvalho Chehab
     
  • As we move stuff around, some doc references are broken. Fix some of
    them via this script:
    ./scripts/documentation-file-ref-check --fix

    Manually checked that produced results are valid.

    Acked-by: Matthias Brugger
    Acked-by: Takashi Iwai
    Acked-by: Jeff Kirsher
    Acked-by: Guenter Roeck
    Acked-by: Miguel Ojeda
    Signed-off-by: Mauro Carvalho Chehab
    Acked-by: Jonathan Corbet

    Mauro Carvalho Chehab
     
  • As we move stuff around, some doc references are broken. Fix some of
    them via this script:
    ./scripts/documentation-file-ref-check --fix

    Manually checked if the produced result is valid, removing a few
    false-positives.

    Acked-by: Takashi Iwai
    Acked-by: Masami Hiramatsu
    Acked-by: Stephen Boyd
    Acked-by: Charles Keepax
    Acked-by: Mathieu Poirier
    Reviewed-by: Coly Li
    Signed-off-by: Mauro Carvalho Chehab
    Acked-by: Jonathan Corbet

    Mauro Carvalho Chehab
     
  • The script:
    ./scripts/documentation-file-ref-check --fix

    Gives multiple hints for broken references on some files.
    Manually use the one that applies for some files.

    Acked-by: Steven Rostedt (VMware)
    Acked-by: James Morris
    Signed-off-by: Mauro Carvalho Chehab
    Acked-by: Jonathan Corbet

    Mauro Carvalho Chehab
     

14 Jun, 2018

2 commits

  • Pull i2c updates from Wolfram Sang:

    - mainly feature additions to drivers (stm32f7, qup, xlp9xx, mlxcpld, ...)

    - conversion to use the i2c_8bit_addr_from_msg macro consistently

    - move includes to platform_data

    - core updates to allow the (still in review) I3C subsystem to connect

    - and the regular share of smaller driver updates

    * 'i2c/for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (68 commits)
    i2c: qup: fix building without CONFIG_ACPI
    i2c: tegra: Remove suspend-resume
    i2c: imx-lpi2c: Switch to SPDX identifier
    i2c: mxs: Switch to SPDX identifier
    i2c: busses: make use of i2c_8bit_addr_from_msg
    i2c: algos: make use of i2c_8bit_addr_from_msg
    i2c: rcar: document R8A77980 bindings
    i2c: qup: Add command-line parameter to override SCL frequency
    i2c: qup: Correct duty cycle for FM and FM+
    i2c: qup: Add support for Fast Mode Plus
    i2c: qup: add probe path for Centriq ACPI devices
    i2c: robotfuzz-osif: drop pointless test
    i2c: robotfuzz-osif: remove pointless local variable
    i2c: rk3x: Don't print visible virtual mapping MMIO address
    i2c: opal: don't check number of messages in the driver
    i2c: ibm_iic: don't check number of messages in the driver
    i2c: imx: Switch to SPDX identifier
    i2c: mux: pca954x: merge calls to of_match_device and of_device_get_match_data
    i2c: mux: demux-pinctrl: use proper parent device for demux adapter
    i2c: mux: improve error message for failed symlink
    ...

    Linus Torvalds
     
  • Currently the code is split over various files with dma- prefixes in the
    lib/ and drives/base directories, and the number of files keeps growing.
    Move them into a single directory to keep the code together and remove
    the file name prefixes. To match the irq infrastructure this directory
    is placed under the kernel/ directory.

    Signed-off-by: Christoph Hellwig

    Christoph Hellwig
     

13 Jun, 2018

2 commits

  • Pull more PCI updates from Bjorn Helgaas:

    - squash AER directory into drivers/pci/pcie/aer.c (Bjorn Helgaas)

    - collect all native hardware drivers under drivers/pci/controller/
    (Shawn Lin)

    * tag 'pci-v4.18-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
    PCI/AER: Use "PCI Express" consistently in Kconfig text
    PCI/AER: Hoist aerdrv.c, aer_inject.c up to drivers/pci/pcie/
    PCI/AER: Squash Kconfig.debug into Kconfig
    PCI/AER: Move private AER things to aerdrv.c
    PCI/AER: Move aer_irq() declaration to portdrv.h
    PCI/AER: Move pcie_aer_get_firmware_first() to portdrv.h
    PCI/AER: Remove duplicate pcie_port_bus_type declaration
    PCI/AER: Squash ecrc.c into aerdrv.c
    PCI/AER: Squash aerdrv_acpi.c into aerdrv.c
    PCI/AER: Squash aerdrv_errprint.c into aerdrv.c
    PCI/AER: Squash aerdrv_core.c into aerdrv.c
    PCI/AER: Reorder code to group probe/remove stuff together
    PCI/AER: Remove forward declarations
    PCI: Collect all native drivers under drivers/pci/controller/

    Linus Torvalds
     
  • Pull MIPS updates from James Hogan:
    "These are the main MIPS changes for 4.18.

    Rough overview:

    - MAINTAINERS: Add Paul Burton as MIPS co-maintainer

    - Misc: Generic compiler intrinsics, Y2038 improvements, Perf+MT fixes

    - Platform support: Netgear WNR1000 V3, Microsemi Ocelot integrated
    switch, Ingenic watchdog cleanups

    More detailed summary:

    Maintainers:

    - Add Paul Burton as MIPS co-maintainer, as I soon won't have access
    to much MIPS hardware, nor enough time to properly maintain MIPS on
    my own.

    Miscellaneous:

    - Use generic GCC library routines from lib/
    - Add notrace to generic ucmpdi2 implementation
    - Rename compiler intrinsic selects to GENERIC_LIB_*
    - vmlinuz: Use generic ashldi3

    - y2038: Convert update/read_persistent_clock() to *_clock64()
    - sni: Remove read_persistent_clock()

    - perf: Fix perf with MT counting other threads
    - Probe for per-TC perf counters in cpu-probe.c
    - Use correct VPE ID for VPE tracing

    Minor cleanups:

    - Avoid unneeded built-in.a in DTS dirs

    - sc-debugfs: Re-use kstrtobool_from_user

    - memset.S: Reinstate delay slot indentation

    - VPE: Fix spelling "uneeded" -> "Unneeded"

    Platform support:

    BCM47xx:

    - Add support for Netgear WNR1000 V3

    - firmware: Support small NVRAM partitions

    - Use __initdata for LEDs platform data

    Ingenic:

    - Watchdog driver & platform code improvements:
    - Disable clock after stopping counter
    - Use devm_* functions
    - Drop module remove function
    - Move platform reset code to restart handler in driver
    - JZ4740: Convert watchdog instantiation to DT
    - JZ4780: Fix watchdog DT node
    - qi_lb60_defconfig: Enable watchdog driver

    Microsemi:

    - Ocelot: Add support for integrated switch
    - pcb123: Connect phys to ports"

    * tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (30 commits)
    MAINTAINERS: Add Paul Burton as MIPS co-maintainer
    MIPS: ptrace: Make FPU context layout comments match reality
    MIPS: memset.S: Reinstate delay slot indentation
    MIPS: perf: Fix perf with MT counting other threads
    MIPS: perf: Use correct VPE ID when setting up VPE tracing
    MIPS: perf: More robustly probe for the presence of per-tc counters
    MIPS: Probe for MIPS MT perf counters per TC
    MIPS: mscc: Connect phys to ports on ocelot_pcb123
    MIPS: mscc: Add switch to ocelot
    MIPS: JZ4740: Drop old platform reset code
    MIPS: qi_lb60: Enable the jz4740-wdt driver
    MIPS: JZ4780: dts: Fix watchdog node
    MIPS: JZ4740: dts: Add bindings for the jz4740-wdt driver
    watchdog: JZ4740: Drop module remove function
    watchdog: JZ4740: Register a restart handler
    watchdog: JZ4740: Use devm_* functions
    watchdog: JZ4740: Disable clock after stopping counter
    MIPS: VPE: Fix spelling mistake: "uneeded" -> "unneeded"
    MIPS: Re-use kstrtobool_from_user()
    MIPS: Convert update_persistent_clock() to update_persistent_clock64()
    ...

    Linus Torvalds
     

12 Jun, 2018

2 commits

  • Pull ARM SoC late updates from Olof Johansson:
    "This is a branch with a few merge requests that either came in late,
    or took a while longer for us to review and merge than usual and thus
    cut it a bit close to the merge window. We stage them in a separate
    branch and if things look good, we still send them up -- and that's
    the case here.

    This is mostly DT additions for Renesas platforms, adding IP block
    descriptions for existing and new SoCs.

    There are also some driver updates for Qualcomm platforms for SMEM/QMI
    and GENI, which is their generalized serial protocol interface"

    * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (186 commits)
    soc: qcom: smem: introduce qcom_smem_virt_to_phys()
    soc: qcom: qmi: fix a buffer sizing bug
    MAINTAINERS: Update pattern for qcom_scm
    soc: Unconditionally include qcom Makefile
    soc: qcom: smem: check sooner in qcom_smem_set_global_partition()
    soc: qcom: smem: fix qcom_smem_set_global_partition()
    soc: qcom: smem: fix off-by-one error in qcom_smem_alloc_private()
    soc: qcom: smem: byte swap values properly
    soc: qcom: smem: return proper type for cached entry functions
    soc: qcom: smem: fix first cache entry calculation
    soc: qcom: cmd-db: Make endian-agnostic
    drivers: qcom: add command DB driver
    arm64: dts: renesas: salvator-common: Add ADV7482 support
    ARM: dts: r8a7740: Add CEU1
    ARM: dts: r8a7740: Add CEU0
    arm64: dts: renesas: salvator-common: enable VIN
    arm64: dts: renesas: r8a77970: add VIN and CSI-2 nodes
    arm64: dts: renesas: r8a77965: add VIN and CSI-2 nodes
    arm64: dts: renesas: r8a7796: add VIN and CSI-2 nodes
    arm64: dts: renesas: r8a7795-es1: add CSI-2 node
    ...

    Linus Torvalds
     
  • Pull ARM SoC platform updates from Olof Johansson:
    "Here are the main updates for SoC support (besides DT additions) for
    ARM 32- and 64-bit platforms. The branch also contains defconfig
    updates to turn on drivers and options as needed on the various
    platforms.

    The largest parts of the delta are from cleanups moving platform data
    and board file setup of TI platforms to ti-sysc bus drivers. There are
    also some sweeping changes of eeprom and nand setup on Davinci, i.MX
    and other platforms.

    Samsung is removing support for Exynos5440, which was an oddball SoC
    that hasn't been seen much use in designs.

    Renesas is adding support for new SoCs (R-Car E3, RZ/G1C and RZ/N1D).

    Linus Walleij is also removing support for ux500 (Sony Ericsson)
    U8540/9540 SoCs that never made it to significant mass production and
    products"

    * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (133 commits)
    MAINTAINERS: add NXP linux team maillist as i.MX reviewer
    ARM: stm32: Don't select DMA unconditionally on STM32MP157C
    arm64: defconfig: Enable PCIe on msm8996 and db820c
    ARM: pxa3xx: enable external wakeup pins
    ARM: pxa: stargate2: use device properties for at24 eeprom
    arm64: defconfig: Enable HISILICON_LPC
    arm64: defconfig: enable drivers for Poplar support
    arm64: defconfig: Enable UFS on msm8996
    ARM: berlin: switch to SPDX license identifier
    arm: berlin: remove non-necessary flush_cache_all()
    ARM: berlin: extend BG2CD Kconfig entry
    OMAP: CLK: CLKSRC: Add suspend resume hooks
    ARM: AM43XX: Add functions to save/restore am43xx control registers
    ASoC: ams_delta: use GPIO lookup table
    ARM: OMAP1: ams-delta: add GPIO lookup tables
    bus: ti-sysc: Fix optional clocks array access
    ARM: OMAP2+: Make sure LOGICRETSTATE bits are not cleared
    ARM: OMAP2+: prm44xx: Inroduce cpu_pm notifiers for context save/restore
    ARM: OMAP2+: prm44xx: Introduce context save/restore for am43 PRCM IO
    ARM: OMAP2+: powerdomain: Introduce cpu_pm notifiers for context save/restore
    ...

    Linus Torvalds
     

11 Jun, 2018

3 commits

  • Pull backlight updates from Lee Jones:
    "Core Frameworks
    - Provide helpers to enable/disable backlight
    - Provide standard and devres versions OF find helpers

    New Drivers:
    - Add support for the Zodiac Inflight Innovations RAVE Supervisory
    Processor

    New Functionality:
    - Allow pwm-on/pwm-off delay to be specified via DT

    Bug Fixes:
    - Fix ordering of the power {en,dis}able and PWM {en,dis}able
    signals
    - Fix Device Tree node look-up"

    * tag 'backlight-next-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
    backlight: as3711_bl: Fix Device Tree node leaks
    backlight: tps65217_bl: Fix Device Tree node lookup
    backlight: max8925_bl: Fix Device Tree node lookup
    backlight: as3711_bl: Fix Device Tree node lookup
    MAINTAINERS: Add dri-devel for backlight subsystem patches
    backlight: Nuke BL_CORE_DRIVER1
    staging: fbtft: Stop using BL_CORE_DRIVER1
    backlight: pandora: Stop using BL_CORE_DRIVER1
    backlight: generic-bl: Remove DRIVER1 state
    backlight: Nuke unused backlight.props.state states
    backlight: otm3225a: Add support for ORISE OTM3225A LCD SoC
    backlight: pwm_bl: Don't use GPIOF_* with gpiod_get_direction
    pwm-backlight: Add support for PWM delays proprieties.
    dt-bindings: pwm-backlight: Add PWM delay proprieties.
    pwm-backlight: Enable/disable the PWM before/after LCD enable toggle.
    dt-bindings: backlight: Add binding for RAVE SP backlight driver
    backlight: Add RAVE SP backlight driver

    Linus Torvalds
     
  • Pull MFD updates from Lee Jones:
    "New Device Support:
    - Add support for AXP813 ADC to AXP20x
    - Add support for PM8005, PM8998 and PMI8998

    New Functionality:
    - Add support for Battery Power Supply to AXP813
    - Add support for SYSCON to SPARD SC27XX SPI
    - Add support for RTC to ChromeOS Embedded-Controller

    Fix-ups:
    - Remove unused code; exynos{4,5}-pmu, cros_ec, cros_ec_acpi_gpe
    - Remove duplicate error messages (-ENOMEM, etc); htc-i2cpld,
    janz-cmodio, max8997, rc5t583, sm501, smsc-ece1099, abx500-core,
    si476x-i2c, ti_am335x_tscadc, tps65090, tps6586x, tps65910,
    tps80031, twl6030-irq, viperboard
    - Succinctly use ptr to struct in sizeof(); rc5t583, abx500-core,
    sm501, smsc-ece1099
    - Simplify syntax for NULL ptr checking; abx500-core, sm501
    - No not unnecessarily initialise variables; tps65910, tps65910
    - Reorganise and simplify driver data; omap-usb-tll
    - Move to SPDX license statement; tps68470
    - Probe ADCs via DT; axp20x
    - Use new GPIOD API; arizona-core
    - Constify things; axp20x
    - Reduce code-size (use MACROS, etc); axp20x, omap-usb-host
    - Add DT support/docs; motorola-cpcap
    - Remove VLAs; rave-sp
    - Use devm_* managed resources; cros_ec
    - Interrogate HW for firmware version; rave-sp
    - Provide ACPI support for ChromeOS Embedded-Controller

    Bug Fixes:
    - Reorder ordered (enum) device list; tps65218
    - Only accept valid data from the offset; rave-sp
    - Refrain from copying junk from failed SPI read; cros_ec_dev
    - Fix potential memory leaks; pcf50633-core
    - Fix clock initialisation; twl-core
    - Fix build-issue; tps65911
    - Fix off-by-one error; tps65911
    - Fix code ordering issues; intel-lpss
    - Fix COMPILE_TEST related issues; pwm-stm32
    - Fix broken MMC card detection; asic3
    - Fix clocking related issues; intel-lpss-pci"

    * tag 'mfd-next-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (84 commits)
    mfd: cros_ec: Remove unused __remove function
    mfd: wm97xx-core: Platform data can be NULL
    mfd: cros_ec_dev: Don't advertise junk features on failure
    mfd: cros_ec: Use devm_kzalloc for private data
    mfd: intel-lpss: Fix Intel Cannon Lake LPSS I2C input clock
    mfd: asic3: Fix broken MMC card detection
    mfd: timberdale: Fix spelling mistake "Uknown" -> "Unknown"
    mfd: omap-usb-host: Use match_string() helper
    mfd: stm32-timers: Fix pwm-stm32 linker issue with COMPILE_TEST
    pwm: stm32: Initialize raw local variables
    mfd: arizona: Update DT doc to support more standard Reset binding
    dt-bindings: mfd: Add bindings for DA9063L
    mfd: intel-lpss: Correct names of RESETS register bits
    mfd: qcom-spmi-pmic: Add support for pm8005, pm8998 and pmi8998
    mfd: intel-lpss: Program REMAP register in PIO mode
    mfd: cros_ec_i2c: Moving the system sleep pm ops to late
    mfd: cros_ec_i2c: Add ACPI module device table
    mfd: cros_ec_dev: Register shutdown function for debugfs
    mfd: cros_ec_dev: Register cros-ec-rtc driver as a subdevice
    mfd: cros_ec: Don't try to grab log when suspended
    ...

    Linus Torvalds
     
  • I soon won't have access to much MIPS hardware, nor enough time to
    properly maintain MIPS on my own, so add Paul Burton as a co-maintainer.

    Also add a link to a new shared git repository on kernel.org for
    linux-next branches and pull request tags.

    Signed-off-by: James Hogan
    Acked-by: Paul Burton
    Acked-by: Florian Fainelli
    Cc: Ralf Baechle
    Cc: Matt Redfearn
    Cc: Maciej W. Rozycki
    Cc: Huacai Chen
    Cc: Aaro Koskinen
    Cc: John Crispin
    Cc: Steven J. Hill
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/19473/

    James Hogan