1. 04 Apr, 2018 4 commits
    • Linus Torvalds's avatar
      Merge branch 'userns-linus' of... · 17dec0a9
      Linus Torvalds authored
      Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
      
      Pull namespace updates from Eric Biederman:
       "There was a lot of work this cycle fixing bugs that were discovered
        after the merge window and getting everything ready where we can
        reasonably support fully unprivileged fuse. The bug fixes you already
        have and much of the unprivileged fuse work is coming in via other
        trees.
      
        Still left for fully unprivileged fuse is figuring out how to cleanly
        handle .set_acl and .get_acl in the legacy case, and properly handling
        of evm xattrs on unprivileged mounts.
      
        Included in the tree is a cleanup from Alexely that replaced a linked
        list with a statically allocated fix sized array for the pid caches,
        which simplifies and speeds things up.
      
        Then there is are some cleanups and fixes for the ipc namespace. The
        motivation was that in reviewing other code it was discovered that
        access ipc objects from different pid namespaces recorded pids in such
        a way that when asked the wrong pids were returned. In the worst case
        there has been a measured 30% performance impact for sysvipc
        semaphores. Other test cases showed no measurable performance impact.
        Manfred Spraul and Davidlohr Bueso who tend to work on sysvipc
        performance both gave the nod that this is good enough.
      
        Casey Schaufler and James Morris have given their approval to the LSM
        side of the changes.
      
        I simplified the types and the code dealing with sysvipc to pass just
        kern_ipc_perm for all three types of ipc. Which reduced the header
        dependencies throughout the kernel and simplified the lsm code.
      
        Which let me work on the pid fixes without having to worry about
        trivial changes causing complete kernel recompiles"
      
      * 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        ipc/shm: Fix pid freeing.
        ipc/shm: fix up for struct file no longer being available in shm.h
        ipc/smack: Tidy up from the change in type of the ipc security hooks
        ipc: Directly call the security hook in ipc_ops.associate
        ipc/sem: Fix semctl(..., GETPID, ...) between pid namespaces
        ipc/msg: Fix msgctl(..., IPC_STAT, ...) between pid namespaces
        ipc/shm: Fix shmctl(..., IPC_STAT, ...) between pid namespaces.
        ipc/util: Helpers for making the sysvipc operations pid namespace aware
        ipc: Move IPCMNI from include/ipc.h into ipc/util.h
        msg: Move struct msg_queue into ipc/msg.c
        shm: Move struct shmid_kernel into ipc/shm.c
        sem: Move struct sem and struct sem_array into ipc/sem.c
        msg/security: Pass kern_ipc_perm not msg_queue into the msg_queue security hooks
        shm/security: Pass kern_ipc_perm not shmid_kernel into the shm security hooks
        sem/security: Pass kern_ipc_perm not sem_array into the sem security hooks
        pidns: simpler allocation of pid_* caches
      17dec0a9
    • Linus Torvalds's avatar
      Merge branch 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · d92cd810
      Linus Torvalds authored
      Pull workqueue updates from Tejun Heo:
       "rcu_work addition and a couple trivial changes"
      
      * 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: remove the comment about the old manager_arb mutex
        workqueue: fix the comments of nr_idle
        fs/aio: Use rcu_work instead of explicit rcu and work item
        cgroup: Use rcu_work instead of explicit rcu and work item
        RCU, workqueue: Implement rcu_work
      d92cd810
    • Linus Torvalds's avatar
      Merge branch 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · a23867f1
      Linus Torvalds authored
      Pull libata updates from Tejun Heo:
       "Nothing too interesting.
      
        The biggest change is refcnting fix for ata_host - the bug is recent
        and can only be triggered on controller hotplug, so very few are
        hitting it.
      
        There also are a number of trivial license / error message changes and
        some hardware specific changes"
      
      * 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (23 commits)
        ahci: imx: add the imx8qm ahci sata support
        libata: ensure host is free'd on error exit paths
        ata: ahci-platform: add reset control support
        ahci: imx: fix the build warning
        ata: add Amiga Gayle PATA controller driver
        ahci: imx: add the imx6qp ahci sata support
        ata: change Tegra124 to Tegra
        ata: ahci_tegra: Add AHCI support for Tegra210
        ata: ahci_tegra: disable DIPM
        ata: ahci_tegra: disable devslp for Tegra124
        ata: ahci_tegra: initialize regulators from soc struct
        ata: ahci_tegra: Update initialization sequence
        dt-bindings: Tegra210: add binding documentation
        libata: add refcounting to ata_host
        pata_bk3710: clarify license version and use SPDX header
        pata_falcon: clarify license version and use SPDX header
        pata_it821x: Delete an error message for a failed memory allocation in it821x_firmware_command()
        pata_macio: Delete an error message for a failed memory allocation in two functions
        pata_mpc52xx: Delete an error message for a failed memory allocation in mpc52xx_ata_probe()
        sata_dwc_460ex: Delete an error message for a failed memory allocation in sata_dwc_port_start()
        ...
      a23867f1
    • Linus Torvalds's avatar
      Merge tag 'media/v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · ef1c4a6f
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
      
       - new CEC pin injection code for testing purposes
      
       - DVB frontend cxd2099 promoted from staging
      
       - new platform driver for Sony cxd2880 DVB devices
      
       - new sensor drivers: mt9t112, ov2685, ov5695, ov772x, tda1997x,
         tw9910.c
      
       - removal of unused cx18 and ivtv alsa mixers
      
       - the reneseas-ceu driver doesn't depend on soc_camera anymore and
         moved from staging
      
       - removed the mantis_vp3028 driver, unused since 2009
      
       - s5p-mfc: add support for version 10 of the MSP
      
       - added a decoder for imon protocol
      
       - atomisp: lots of cleanups
      
       - imx074 and mt9t031: don't depend on soc_camera anymore, being
         promoted from staging
      
       - added helper functions to better support DVB I2C binding
      
       - lots of driver improvements and cleanups
      
      * tag 'media/v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (438 commits)
        media: v4l2-ioctl: rename a temp var that stores _IOC_SIZE(cmd)
        media: fimc-capture: get rid of two warnings
        media: dvb-usb-v2: fix a missing dependency of I2C_MUX
        media: uvc: to the right check at uvc_ioctl_enum_framesizes()
        media: cec-core: fix a bug at cec_error_inj_write()
        media: tda9840: cleanup a warning
        media: tm6000:  avoid casting just to print pointer address
        media: em28xx-input: improve error handling code
        media: zr364xx: avoid casting just to print pointer address
        media: vivid-radio-rx: add a cast to avoid a warning
        media: saa7134-alsa: don't use casts to print a buffer address
        media: solo6x10: get rid of an address space warning
        media: zoran: don't cast pointers to print them
        media: ir-kbd-i2c: change the if logic to avoid a warning
        media: ir-kbd-i2c: improve error handling code
        media: saa7134-input: improve error handling
        media: s2255drv: fix a casting warning
        media: ivtvfb: Cleanup some warnings
        media: videobuf-dma-sg: Fix a weird cast
        soc_camera: fix a weird cast on printk
        ...
      ef1c4a6f
  2. 03 Apr, 2018 25 commits
    • Linus Torvalds's avatar
      Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 147a89bc
      Linus Torvalds authored
      Pull Kconfig updates from Masahiro Yamada:
      
       - improve checkpatch for more precise Kconfig code checking
      
       - clarify effective selects by grouping reverse dependencies in help
      
       - do not write out '# CONFIG_FOO is not set' from invisible symbols
      
       - make oldconfig as silent as it should be
      
       - rename 'silentoldconfig' to 'syncconfig'
      
       - add unit-test framework and several test cases
      
       - warn unmet dependency of tristate symbols
      
       - make unmet dependency warnings readable, removing false positives
      
       - improve recursive include detection
      
       - use yylineno to simplify the line number tracking
      
       - misc cleanups
      
      * tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (30 commits)
        kconfig: use yylineno option instead of manual lineno increments
        kconfig: detect recursive inclusion earlier
        kconfig: remove duplicated file name and lineno of recursive inclusion
        kconfig: do not include both curses.h and ncurses.h for nconfig
        kconfig: make unmet dependency warnings readable
        kconfig: warn unmet direct dependency of tristate symbols selected by y
        kconfig: tests: test if recursive inclusion is detected
        kconfig: tests: test if recursive dependencies are detected
        kconfig: tests: test randconfig for choice in choice
        kconfig: tests: test defconfig when two choices interact
        kconfig: tests: check visibility of tristate choice values in y choice
        kconfig: tests: check unneeded "is not set" with unmet dependency
        kconfig: tests: test if new symbols in choice are asked
        kconfig: tests: test automatic submenu creation
        kconfig: tests: add basic choice tests
        kconfig: tests: add framework for Kconfig unit testing
        kbuild: add PYTHON2 and PYTHON3 variables
        kconfig: remove redundant streamline_config.pl prerequisite
        kconfig: rename silentoldconfig to syncconfig
        kconfig: invoke oldconfig instead of silentoldconfig from local*config
        ...
      147a89bc
    • Linus Torvalds's avatar
      Merge tag 'kbuild-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 3b24b837
      Linus Torvalds authored
      Pull Kbuild updates from Masahiro Yamada:
      
       - add a shell script to get Clang version
      
       - improve portability of build scripts
      
       - drop always-enabled CONFIG_THIN_ARCHIVE and remove unused code
      
       - rename built-in.o which is now thin archive to built-in.a
      
       - process clean/build targets one by one to get along with -j option
      
       - simplify ld-option
      
       - improve building with CONFIG_TRIM_UNUSED_KSYMS
      
       - define KBUILD_MODNAME even for objects shared among multiple modules
      
       - avoid linking multiple instances of same objects from composite
         objects
      
       - move <linux/compiler_types.h> to c_flags to include it only for C
         files
      
       - clean-up various Makefiles
      
      * tag 'kbuild-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (29 commits)
        kbuild: get <linux/compiler_types.h> out of <linux/kconfig.h>
        kbuild: clean up link rule of composite modules
        kbuild: clean up archive rule of built-in.a
        kbuild: remove partial section mismatch detection for built-in.a
        net: liquidio: clean up Makefile for simpler composite object handling
        lib: zstd: clean up Makefile for simpler composite object handling
        kbuild: link $(real-obj-y) instead of $(obj-y) into built-in.a
        kbuild: rename real-objs-y/m to real-obj-y/m
        kbuild: move modname and modname-multi close to modname_flags
        kbuild: simplify modname calculation
        kbuild: fix modname for composite modules
        kbuild: define KBUILD_MODNAME even if multiple modules share objects
        kbuild: remove unnecessary $(subst $(obj)/, , ...) in modname-multi
        kbuild: Use ls(1) instead of stat(1) to obtain file size
        kbuild: link vmlinux only once for CONFIG_TRIM_UNUSED_KSYMS
        kbuild: move include/config/ksym/* to include/ksym/*
        kbuild: move CONFIG_TRIM_UNUSED_KSYMS code unneeded for external module
        kbuild: restore autoksyms.h touch to the top Makefile
        kbuild: move 'scripts' target below
        kbuild: remove wrong 'touch' in adjust_autoksyms.sh
        ...
      3b24b837
    • Linus Torvalds's avatar
      Merge branch 'parisc-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 0734e00e
      Linus Torvalds authored
      Pull parisc updates from Helge Deller:
       "Lots of small enhancements and fixes in this patchset:
      
         - improved the x86-64 compatibility for PCI cards by returning -1UL
           for timed out MMIO transactions (instead of crashing)
      
         - fixed HPMC handler for PAT machines: size needs to be multiple of 16
      
         - prepare machine_power_off() to be able to turn rp3410 and c8000
           machines off via IMPI
      
         - added code to extract machine info for usage with qemu
      
         - some init sections fixes
      
         - lots of fixes for sparse-, ubsan- and uninitalized variables
           warnings"
      
      * 'parisc-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Fix out of array access in match_pci_device()
        parisc: Add code generator for Qemu/SeaBIOS machine info
        parisc/pci: Switch LBA PCI bus from Hard Fail to Soft Fail mode
        parisc: Fix HPMC handler by increasing size to multiple of 16 bytes
        parisc: Directly call machine_power_off() in power button driver
        parisc: machine_power_off() should call pm_power_off()
        parisc/Kconfig: SMP kernels boot on all machines
        parisc: Silence uninitialized variable warning in dbl_to_sgl_fcnvff()
        parisc: Move various functions and strings to init section
        parisc: Convert MAP_TYPE to cover 4 bits on parisc
        parisc: Force to various endian types for sparse
        parisc/gscps2: Fix sparse warnings
        parisc/led: Fix sparse warnings
        parisc/parport_gsc: Use NULL to avoid sparse warning
        parisc/stifb: Use fb_memset() to avoid sparse warning
      0734e00e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next · 4608f064
      Linus Torvalds authored
      Pull sparc updates from David Miller:
      
       1) Add support for ADI (Application Data Integrity) found in more
          recent sparc64 cpus. Essentially this is keyed based access to
          virtual memory, and if the key encoded in the virual address is
          wrong you get a trap.
      
          The mm changes were reviewed by Andrew Morton and others.
      
          Work by Khalid Aziz.
      
       2) Validate DAX completion index range properly, from Rob Gardner.
      
       3) Add proper Kconfig deps for DAX driver. From Guenter Roeck.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
        sparc64: Make atomic_xchg() an inline function rather than a macro.
        sparc64: Properly range check DAX completion index
        sparc: Make auxiliary vectors for ADI available on 32-bit as well
        sparc64: Oracle DAX driver depends on SPARC64
        sparc64: Update signal delivery to use new helper functions
        sparc64: Add support for ADI (Application Data Integrity)
        mm: Allow arch code to override copy_highpage()
        mm: Clear arch specific VM flags on protection change
        mm: Add address parameter to arch_validate_prot()
        sparc64: Add auxiliary vectors to report platform ADI properties
        sparc64: Add handler for "Memory Corruption Detected" trap
        sparc64: Add HV fault type handlers for ADI related faults
        sparc64: Add support for ADI register fields, ASIs and traps
        mm, swap: Add infrastructure for saving page metadata on swap
        signals, sparc: Add signal codes for ADI violations
      4608f064
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 5bb053be
      Linus Torvalds authored
      Pull networking updates from David Miller:
      
       1) Support offloading wireless authentication to userspace via
          NL80211_CMD_EXTERNAL_AUTH, from Srinivas Dasari.
      
       2) A lot of work on network namespace setup/teardown from Kirill Tkhai.
          Setup and cleanup of namespaces now all run asynchronously and thus
          performance is significantly increased.
      
       3) Add rx/tx timestamping support to mv88e6xxx driver, from Brandon
          Streiff.
      
       4) Support zerocopy on RDS sockets, from Sowmini Varadhan.
      
       5) Use denser instruction encoding in x86 eBPF JIT, from Daniel
          Borkmann.
      
       6) Support hw offload of vlan filtering in mvpp2 dreiver, from Maxime
          Chevallier.
      
       7) Support grafting of child qdiscs in mlxsw driver, from Nogah
          Frankel.
      
       8) Add packet forwarding tests to selftests, from Ido Schimmel.
      
       9) Deal with sub-optimal GSO packets better in BBR congestion control,
          from Eric Dumazet.
      
      10) Support 5-tuple hashing in ipv6 multipath routing, from David Ahern.
      
      11) Add path MTU tests to selftests, from Stefano Brivio.
      
      12) Various bits of IPSEC offloading support for mlx5, from Aviad
          Yehezkel, Yossi Kuperman, and Saeed Mahameed.
      
      13) Support RSS spreading on ntuple filters in SFC driver, from Edward
          Cree.
      
      14) Lots of sockmap work from John Fastabend. Applications can use eBPF
          to filter sendmsg and sendpage operations.
      
      15) In-kernel receive TLS support, from Dave Watson.
      
      16) Add XDP support to ixgbevf, this is significant because it should
          allow optimized XDP usage in various cloud environments. From Tony
          Nguyen.
      
      17) Add new Intel E800 series "ice" ethernet driver, from Anirudh
          Venkataramanan et al.
      
      18) IP fragmentation match offload support in nfp driver, from Pieter
          Jansen van Vuuren.
      
      19) Support XDP redirect in i40e driver, from Björn Töpel.
      
      20) Add BPF_RAW_TRACEPOINT program type for accessing the arguments of
          tracepoints in their raw form, from Alexei Starovoitov.
      
      21) Lots of striding RQ improvements to mlx5 driver with many
          performance improvements, from Tariq Toukan.
      
      22) Use rhashtable for inet frag reassembly, from Eric Dumazet.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1678 commits)
        net: mvneta: improve suspend/resume
        net: mvneta: split rxq/txq init and txq deinit into SW and HW parts
        ipv6: frags: fix /proc/sys/net/ipv6/ip6frag_low_thresh
        net: bgmac: Fix endian access in bgmac_dma_tx_ring_free()
        net: bgmac: Correctly annotate register space
        route: check sysctl_fib_multipath_use_neigh earlier than hash
        fix typo in command value in drivers/net/phy/mdio-bitbang.
        sky2: Increase D3 delay to sky2 stops working after suspend
        net/mlx5e: Set EQE based as default TX interrupt moderation mode
        ibmvnic: Disable irqs before exiting reset from closed state
        net: sched: do not emit messages while holding spinlock
        vlan: also check phy_driver ts_info for vlan's real device
        Bluetooth: Mark expected switch fall-throughs
        Bluetooth: Set HCI_QUIRK_SIMULTANEOUS_DISCOVERY for BTUSB_QCA_ROME
        Bluetooth: btrsi: remove unused including <linux/version.h>
        Bluetooth: hci_bcm: Remove DMI quirk for the MINIX Z83-4
        sh_eth: kill useless check in __sh_eth_get_regs()
        sh_eth: add sh_eth_cpu_data::no_xdfar flag
        ipv6: factorize sk_wmem_alloc updates done by __ip6_append_data()
        ipv4: factorize sk_wmem_alloc updates done by __ip_append_data()
        ...
      5bb053be
    • Linus Torvalds's avatar
      Merge tag 'docs-4.17' of git://git.lwn.net/linux · bb2407a7
      Linus Torvalds authored
      Pull documentation updates from Jonathan Corbet:
       "There's been a fair amount of activity in Documentation/ this time
        around:
      
         - Lots of work aligning Documentation/ABI with reality, done by
           Aishwarya Pant.
      
         - The trace documentation has been converted to RST by Changbin Du
      
         - I thrashed up kernel-doc to deal with a parsing issue and to try to
           make the code more readable. It's still a 20+-year-old Perl hack,
           though.
      
         - Lots of other updates, typo fixes, and more"
      
      * tag 'docs-4.17' of git://git.lwn.net/linux: (82 commits)
        Documentation/process: update FUSE project website
        docs: kernel-doc: fix parsing of arrays
        dmaengine: Fix spelling for parenthesis in dmatest documentation
        dmaengine: Make dmatest.rst indeed reST compatible
        dmaengine: Add note to dmatest documentation about supported channels
        Documentation: magic-numbers: Fix typo
        Documentation: admin-guide: add kvmconfig, xenconfig and tinyconfig commands
        Input: alps - Update documentation for trackstick v3 format
        Documentation: Mention why %p prints ptrval
        COPYING: use the new text with points to the license files
        COPYING: create a new file with points to the Kernel license files
        Input: trackpoint: document sysfs interface
        xfs: Change URL for the project in xfs.txt
        char/bsr: add sysfs interface documentation
        acpi: nfit: document sysfs interface
        block: rbd: update sysfs interface
        Documentation/sparse: fix typo
        Documentation/CodingStyle: Add an example for braces
        docs/vm: update 00-INDEX
        kernel-doc: Remove __sched markings
        ...
      bb2407a7
    • Linus Torvalds's avatar
      Merge tag 'leds_for_4.17-rc1' of... · e40dc662
      Linus Torvalds authored
      Merge tag 'leds_for_4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds
      
      Pull LED updates from Jacek Anaszewski:
       "New LED class driver:
         - add driver for Mellanox regmap LEDs
      
        Improvement to ledtrig-disk:
         - extend disk trigger for reads and writes
      
        Improvements and fixes to existing LED class drivers:
         - add more product/board names for PC Engines APU2
         - fix wrong dmi_match on PC Engines APU LEDs
         - clarify chips supported by LM355x driver
         - fix Kconfig text for MLXCPLD, SYSCON, MC13783, NETXBIG
         - allow leds-mlxcpld compilation for 32 bit arch"
      
      * tag 'leds_for_4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
        leds: Fix wrong dmi_match on PC Engines APU LEDs
        leds: Extends disk trigger for reads and writes
        leds: Add more product/board names for PC Engines APU2
        leds: add driver for support Mellanox regmap LEDs for BMC and x86 platform
        leds: fix Kconfig text for MLXCPLD, SYSCON, MC13783, NETXBIG
        leds: Clarify supported chips by LM355x driver
        leds: leds-mlxcpld: Allow compilation for 32 bit arch
      e40dc662
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.17' of git://github.com/cminyard/linux-ipmi · cc5ada7c
      Linus Torvalds authored
      Pull IPMI updates from Corey Minyard:
       "Mostly small changes, as usual.
      
        This does add an IPMI BMC server-side driver, to allow a Linux system
        to act as an IPMI controller. That's the biggest change, but it is
        just a new driver that is fairly narrow in use.
      
        The other largish change is removing ACPI SPMI probe support, which
        should have never really been there in the beginning"
      
      * tag 'for-linus-4.17' of git://github.com/cminyard/linux-ipmi:
        ipmi/parisc: Add IPMI chassis poweroff for certain HP PA-RISC and IA-64 servers
        ipmi_ssif: Fix kernel panic at msg_done_handler
        ipmi:pci: Blacklist a Realtek "IPMI" device
        ipmi: Remove ACPI SPMI probing from the system interface driver
        ipmi: Remove ACPI SPMI probing from the SSIF (I2C) driver
        ipmi: missing error code in try_smi_init()
        ipmi: use ARRAY_SIZE for poweroff_functions array sizing calculation
        ipmi: Consolidate cleanup code
        ipmi: Remove some unnecessary initializations
        ipmi: Fix some error cleanup issues
        ipmi: Add or fix SPDX-License-Identifier in all files
        ipmi: Re-use existing macros for built-in properties
        ipmi:pci: Make the PCI defines consistent with normal Linux ones
        ipmi: kcs_bmc: coding-style fixes and use new poll type
        char/ipmi: add documentation for sysfs interface
        ipmi: kcs_bmc: mark expected switch fall-through in kcs_bmc_handle_data
        ipmi: add an Aspeed KCS IPMI BMC driver
        ipmi: add a KCS IPMI BMC driver
      cc5ada7c
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 77624cd2
      Linus Torvalds authored
      Pull pin control bulk updates from Linus Walleij:
       "New drivers:
      
         - Qualcomm SDM845: this is their new flagship SoC platform which
           seems to be targeted at premium mobile handsets.
      
         - Renesas R-Car M3-N SoC.
      
         - Renesas R8A77980 SoC.
      
         - NXP (ex Freescale) i.MX 6SLL SoC.
      
         - Mediatek MT2712 SoC.
      
         - Allwinner H6 SoC.
      
        Improvements:
      
         - Uniphier adds a few new functions and pins.
      
         - Renesas refactorings and additional pin definitions.
      
         - Improved pin groups for Axis Artpec6.
      
        Cleanup:
      
         - Drop the TZ1090 drivers. This platform is no longer maintained and
           is being deleted.
      
         - Drop ST-Ericsson U8540/U9540 support as this was never
           productified.
      
         - Overall minor fixes and janitorial"
      
      * tag 'pinctrl-v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (82 commits)
        pinctrl: uniphier: add UART hardware flow control pin-mux settings
        pinctrl: sunxi: add support for the Allwinner H6 main pin controller
        pinctrl: sunxi: change irq_bank_base to irq_bank_map
        pinctrl: sunxi: introduce IRQ bank conversion function
        pinctrl: sunxi: refactor irq related register function to have desc
        pinctrl: msm8998: Remove owner assignment from platform_driver
        pinctrl: uniphier: divide I2S and S/PDIF audio out pin-mux group
        pinctrl: uniphier: add PXs2 Audio in/out pin-mux settings
        pinctrl/amd: poll InterruptEnable bits in enable_irq
        pinctrl: ocelot: fix gpio direction
        pinctrl: mtk: fix check warnings.
        pintcrl: mtk: support bias-disable of generic and special pins simultaneously
        pinctrl: add mt2712 pinctrl driver
        pinctrl: pinctrl-single: Fix pcs_request_gpio() when bits_per_mux != 0
        pinctrl: imx: Add pinctrl driver support for imx6sll
        dt-bindings: imx: update pinctrl doc for imx6sll
        pinctrl: intel: Implement intel_gpio_get_direction callback
        pinctrl: stm32: add 'depends on HAS_IOMEM' to fix unmet dependency
        pinctrl: mediatek: mtk-common: use true and false for boolean values
        pinctrl: sunxi: always look for apb block
        ...
      77624cd2
    • Linus Torvalds's avatar
      Merge tag 'mmc-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc · dc73d6a8
      Linus Torvalds authored
      Pull MMC updates from Ulf Hansson:
       "MMC core:
         - Export host capabilities through debugfs
         - Export card RCA register via sysfs
         - Improve card initializing sequence while enabling 4-bit bus
         - Export a function to enable/disable wakeup for card detect IRQ
      
        MMC host:
         - dw_mmc: Add support for new hi3798cv200 variant
         - dw_mmc: Remove support for some deprecated DT properties
         - mediatek: Add support for new variant used on MT7622 SoC
         - sdhci: Improve wakeup support for SDIO IRQs
         - sdhci: Improve wakeup support for card detect IRQs
         - sdhci-omap: Add tuning support
         - sdhci_omap: Add UHS-I mode support
         - sunxi: Prepare for runtime PM support via a few re-factorings
         - tmio: deprecate "toshiba,mmc-wrprotect-disable" DT property
         - tmio/renesas_sdhi: Consolidate code supporting write protect
         - tmio: Improve DMA vs PIO handling
         - tmio: Add support for IP-builtin card detection logic"
      
      * tag 'mmc-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (55 commits)
        mmc: renesas_sdhi: replace EXT_ACC with HOST_MODE
        mmc: update sdio_claim_irq documentation
        mmc: Export host capabilities to debugfs.
        mmc: core: Disable HPI for certain Micron (Numonyx) eMMC cards
        mmc: block: fix updating ext_csd caches on ioctl call
        mmc: sunxi: Set our device drvdata earlier
        mmc: sunxi: Move the reset deassertion before enabling the clocks
        mmc: sunxi: Move resources management to separate functions
        mmc: dw_mmc: add support for hi3798cv200 specific extensions of dw-mshc
        dt-bindings: mmc: add bindings for hi3798cv200-dw-mshc
        mmc: core: Export card RCA register via sysfs
        mmc: renesas_sdhi: fix WP detection
        mmc: core: Use memdup_user() rather than duplicating its implementation
        mmc: dw_mmc-rockchip: correct property names in debug
        mmc: sd: Remove redundant err assignment from mmc_read_switch
        mmc: sdio: Check the return value of sdio_enable_4bit_bus
        mmc: core: Don't try UHS-I mode if 4-bit mode isn't supported
        arm64: dts: hi3660: remove 'num-slots' property for dwmmc
        ARM: dts: lpc18xx: remove 'num-slots' property for dwmmc
        arm64: dts: stratix10: remove 'num-slots' property for dwmmc
        ...
      dc73d6a8
    • Linus Torvalds's avatar
      Merge tag 'hsi-for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi · dabe5184
      Linus Torvalds authored
      Pull HSI updates from Sebastian Reichel:
      
       - spelling/typo fixes
      
       - remove extra error printing for -ENOMEM
      
      * tag 'hsi-for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
        HSI: hsi_char: Delete an error message for a failed memory allocation in hsc_probe()
        HSI: ssi_protocol: fix spelling mistake: "trigerred" -> "triggered"
        HSI: ssi_protocol: Delete an error message for a failed memory allocation in ssi_protocol_probe()
        HSI: ssi_protocol: Fix a typo in two comment lines
      dabe5184
    • Linus Torvalds's avatar
      Merge tag 'for-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · 3ac684b8
      Linus Torvalds authored
      Pull power supply and reset updates from Sebastian Reichel:
      
       - Microsemi Ocelot reset support
      
       - Spreadtrum SC27xx reset support
      
       - generic gpio charger: lot's of cleanups
      
       - axp20x fuel gauge: add AXP813 support
      
       - misc fixes, including one devicetree change for the Nokia N900, that
         has been Acked-by Tony Lindgren
      
      * tag 'for-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (27 commits)
        power: reset: at91-reset: Switch from the pr_*() to the dev_*() logging functions
        power: reset: at91-poweroff: Remove redundant dev_err call in at91_poweroff_probe()
        power: reset: at91-poweroff: Switch from the pr_*() to the dev_*() logging functions
        power: reset: make function sc27xx_poweroff_shutdown static
        power: supply: da9150-fg: remove VLA usage
        ARM: dts: omap3-n900: Add link between battery and charger
        power: supply: bq2415x: add DT referencing support
        power: supply: bq27xxx: support missing supplier device
        max17042: propagate of_node to power supply device
        power: supply: axp288_fuel_gauge: Fix full status reporting
        power: supply: axp288_fuel_gauge: Do not register FG on ECS EF20EA
        power: reset: gpio-poweroff: Support for timeout from device property
        dt-bindings: power: reset: gpio-poweroff: Add 'timeout-ms' property
        power: reset: Add Spreadtrum SC27xx PMIC power off support
        power: supply: axp20x_battery: add support for AXP813
        dt-bindings: power: supply: axp20x: add AXP813 battery DT binding
        power: supply: axp20x_battery: use data struct for variant specific code
        power: supply: gpio-charger: Remove pdata from gpio_charger
        power: supply: gpio-charger: Use GPIOF_ACTIVE_LOW for legacy setup
        power: supply: gpio-charger: Remove redundant dev_err call in probe function
        ...
      3ac684b8
    • Linus Torvalds's avatar
      Merge tag 'spi-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 75dcc7ef
      Linus Torvalds authored
      Pull SPI updates from Mark Brown:
       "A quiet release for SPI, some fixes and small updates for individual
        drivers with one bigger change from Linus Walleij which coverts the
        bitbanging SPI driver to use the GPIO descriptor API from Linus
        Walleij.
      
        Since GPIO descriptors were used by platform data this means there's a
        few changes in arch/ making relevant updates for a few platforms and
        one misc driver that are affected"
      
      * tag 'spi-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (24 commits)
        MAINTAINERS: update Andi's e-mail
        spi: spi-atmel: Use correct enum for DMA transfer direction
        spi: sh-msiof: Document R-Car M3-N support
        spi: sh-msiof: Use correct enum for DMA transfer direction
        spi: sprd: Add the support of restarting the system
        spi: sprd: Simplify the transfer function
        spi: Fix unregistration of controller with fixed SPI bus number
        spi: rspi: use correct enum for DMA transfer direction
        spi: jcore: disable ref_clk after getting its rate
        spi: bcm-qspi: fIX some error handling paths
        spi: pxa2xx: Disable runtime PM if controller registration fails
        spi: tegra20-slink: use true and false for boolean values
        spi: Fix scatterlist elements size in spi_map_buf
        spi: atmel: init FIFOs before spi enable
        spi: orion: Prepare space for per-child options
        spi: orion: Make the error message greppable
        spi: orion: Rework GPIO CS handling
        spi: bcm2835aux: Avoid 64-bit arithmetic in xfer len calc
        spi: spi-gpio: Augment device tree bindings
        spi: spi-gpio: Rewrite to use GPIO descriptors
        ...
      75dcc7ef
    • Linus Torvalds's avatar
      Merge tag 'regulator-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · b51c4354
      Linus Torvalds authored
      Pull regulator updates from Mark Brown:
       "A very small set of updates for the regulator API this time around,
        there's a few bug fixes and also:
      
         - Conversion of the regulator API to use GPIO descriptors rather than
           numbers from Linus Walleij.
      
         - New drivers for Marvell 88PG86x and Qualcomm PM8998 and PMI8998"
      
      * tag 'regulator-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: qcom: smd: Add pm8998 and pmi8998 regulators
        regulator: core: Add missing blank line between functions
        regulator: qcom_smd: Drop regulator/{machine,of_regulator} includes
        regulator: giving regulator controlling gpios a non-empty label when used through the devicetree.
        regulator: gpio: Fix some error handling paths in 'gpio_regulator_probe()'
        regulator: 88pg86x: new i2c dual regulator chip
        regulator: 88pg86x: add DT bindings document
        regulator: da9211: Pass descriptors instead of GPIO numbers
        regulator: da9055: Pass descriptor instead of GPIO number
        regulator: core: Support passing an initialized GPIO enable descriptor
        regulator: dt: regulator-name is required property
        regulator: of: Add a missing 'of_node_put()' in an error handling path of 'of_regulator_match()'
      b51c4354
    • Linus Torvalds's avatar
      Merge tag 'regmap-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · ffd776bf
      Linus Torvalds authored
      Pull regmap updates from Mark Brown:
       "This is a fairly large set of updates for regmap, mainly bugfixes.
      
        The biggest bit of this is some fixes for the bulk operations code
        which had issues in some use cases, Charles Keepax has sorted them
        out. We also gained the ability to use debugfs with syscon regmaps and
        to specify the clock to be used with MMIO regmaps"
      
      * tag 'regmap-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: (21 commits)
        regmap: debugfs: Improve warning message on debugfs_create_dir() failure
        regmap: debugfs: Free map->debugfs_name when debugfs_create_dir() failed
        regmap: debugfs: Don't leak dummy names
        regmap: debugfs: Disambiguate dummy debugfs file name
        regmap: mmio: Add function to attach a clock
        regmap: Merge redundant handling in regmap_bulk_write
        regmap: Tidy up regmap_raw_write chunking code
        regmap: Move the handling for max_raw_write into regmap_raw_write
        regmap: Remove unnecessary printk for failed allocation
        regmap: Format data for raw write in regmap_bulk_write
        regmap: use debugfs even when no device
        regmap: Allow missing device in regmap_name_read_file()
        regmap: Use _regmap_read in regmap_bulk_read
        regmap: Tidy up regmap_raw_read chunking code
        regmap: Move the handling for max_raw_read into regmap_raw_read
        regmap: Use helper function for register offset
        regmap: Don't use format_val in regmap_bulk_read
        regmap: Correct comparison in regmap_cached
        regmap: Correct offset handling in regmap_volatile_range
        regmap-i2c: Off by one in regmap_i2c_smbus_i2c_read/write()
        ...
      ffd776bf
    • Linus Torvalds's avatar
      Merge tag 'pm-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · f2d28566
      Linus Torvalds authored
      Pull power management updates from Rafael Wysocki:
       "These update the cpuidle poll state definition to reduce excessive
        energy usage related to it, add new CPU ID to the RAPL power capping
        driver, update the ACPI system suspend code to handle some special
        cases better, extend the PM core's device links code slightly, add new
        sysfs attribute for better suspend-to-idle diagnostics and easier
        hibernation handling, update power management tools and clean up
        cpufreq quite a bit.
      
        Specifics:
      
         - Modify the cpuidle poll state implementation to prevent CPUs from
           staying in the loop in there for excessive times (Rafael Wysocki).
      
         - Add Intel Cannon Lake chips support to the RAPL power capping
           driver (Joe Konno).
      
         - Add reference counting to the device links handling code in the PM
           core (Lukas Wunner).
      
         - Avoid reconfiguring GPEs on suspend-to-idle in the ACPI system
           suspend code (Rafael Wysocki).
      
         - Allow devices to be put into deeper low-power states via ACPI if
           both _SxD and _SxW are missing (Daniel Drake).
      
         - Reorganize the core ACPI suspend-to-idle wakeup code to avoid a
           keyboard wakeup issue on Asus UX331UA (Chris Chiu).
      
         - Prevent the PCMCIA library code from aborting suspend-to-idle due
           to noirq suspend failures resulting from incorrect assumptions
           (Rafael Wysocki).
      
         - Add coupled cpuidle supprt to the Exynos3250 platform (Marek
           Szyprowski).
      
         - Add new sysfs file to make it easier to specify the image storage
           location during hibernation (Mario Limonciello).
      
         - Add sysfs files for collecting suspend-to-idle usage and time
           statistics for CPU idle states (Rafael Wysocki).
      
         - Update the pm-graph utilities (Todd Brandt).
      
         - Reduce the kernel log noise related to reporting Low-power Idle
           constraings by the ACPI system suspend code (Rafael Wysocki).
      
         - Make it easier to distinguish dedicated wakeup IRQs in the
           /proc/interrupts output (Tony Lindgren).
      
         - Add the frequency table validation in cpufreq to the core and drop
           it from a number of cpufreq drivers (Viresh Kumar).
      
         - Drop "cooling-{min|max}-level" for CPU nodes from a couple of DT
           bindings (Viresh Kumar).
      
         - Clean up the CPU online error code path in the cpufreq core (Viresh
           Kumar).
      
         - Fix assorted issues in the SCPI, CPPC, mediatek and tegra186
           cpufreq drivers (Arnd Bergmann, Chunyu Hu, George Cherian, Viresh
           Kumar).
      
         - Drop memory allocation error messages from a few places in cpufreq
           and cpuildle drivers (Markus Elfring)"
      
      * tag 'pm-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (56 commits)
        ACPI / PM: Fix keyboard wakeup from suspend-to-idle on ASUS UX331UA
        cpufreq: CPPC: Use transition_delay_us depending transition_latency
        PM / hibernate: Change message when writing to /sys/power/resume
        PM / hibernate: Make passing hibernate offsets more friendly
        cpuidle: poll_state: Avoid invoking local_clock() too often
        PM: cpuidle/suspend: Add s2idle usage and time state attributes
        cpuidle: Enable coupled cpuidle support on Exynos3250 platform
        cpuidle: poll_state: Add time limit to poll_idle()
        cpufreq: tegra186: Don't validate the frequency table twice
        cpufreq: speedstep: Don't validate the frequency table twice
        cpufreq: sparc: Don't validate the frequency table twice
        cpufreq: sh: Don't validate the frequency table twice
        cpufreq: sfi: Don't validate the frequency table twice
        cpufreq: scpi: Don't validate the frequency table twice
        cpufreq: sc520: Don't validate the frequency table twice
        cpufreq: s3c24xx: Don't validate the frequency table twice
        cpufreq: qoirq: Don't validate the frequency table twice
        cpufreq: pxa: Don't validate the frequency table twice
        cpufreq: ppc_cbe: Don't validate the frequency table twice
        cpufreq: powernow: Don't validate the frequency table twice
        ...
      f2d28566
    • Linus Torvalds's avatar
      Merge tag 'acpi-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · be553754
      Linus Torvalds authored
      Pull ACPI updates from Rafael Wysocki:
       "These update the ACPICA code in the kernel to follow upstream revision
        20180313 which includes fixes related to the so-called module-level
        AML (mostly "if" type of statements outside of any methods) that
        should improve the handling of systems that load alternative SSDTs
        depending on the current configuration, for example, and event
        handling fixes related to disabling and enabling GPEs on system
        startup and on suspend/resume.
      
        Moreover, the ACPICA license boilerplate is replaced with SPDX license
        IDs which alone reduces the number of lines of ACPICA code in the
        kernel quite a bit.
      
        Also added is a new driver for the generic ACPI Time and Alarm Device
        (TAD). At the moment it only handles the most basic capabilities of
        the TAD, however.
      
        In addition to that the ACPI battery driver is improved to handle
        battery thresholds on ThinkPads, among other things, some bugs are
        fixed, a new backlight quirk is added and some documentation is
        updated.
      
        Specifics:
      
         - Update the in-kernel ACPICA code to upstream revision 20180313
           including:
            * Module-level AML code handling fixes and simplifications (Bob
              Moore, Erik Schmauss).
            * Fixes and cleanups related to messaging (Bob Moore).
            * Events handling fixes related to disabling and enabling GPEs
              (Erik Schmauss).
            * Introduction of SPDX license identifiers and removal of license
              boilerplate in multiple files (Erik Schmauss).
            * Assorted fixes and cleanups (Bob Moore, Erik Schmauss, Hans de
              Goede, Seunghun Han).
      
         - Add new basic driver for the ACPI Time and Alarm Device (Rafael
           Wysocki).
      
         - Modify the ACPI battery driver to support battery thresholds on
           Lenovo ThinkPads (Ognjen Galic, Colin Ian King).
      
         - Avoid reporting battery capacity over 100 in the ACPI battery
           driver in some cases (Laszlo Toth).
      
         - Make the kernel recognize an OEM _OSI string from Dell to avoid
           power management issues with NVidia GPUs in Dell platforms (Alex
           Hung).
      
         - Make the PCI IRQ management code handle missing _PRS cleanly (Alex
           Hung).
      
         - Fix uevent notifications related to device hotplut (Lee, Chun-Yi).
      
         - Prevent the ACPI PAD driver from leaking memory (Lenny Szubowicz).
      
         - Update the ACPI CPPC library code to include subspace IDs in the
           kernel messages logged by it (George Cherian).
      
         - Add backlight quirk for Samsung 670Z5E (Hans de Goede).
      
         - Add the NFIT and HMAT tables to the list of ACPI tables that can be
           overridden via initrd (Dan Williams).
      
         - Fix and clean up some ACPI documentation and Kconfig help language
           (Aishwarya Pant, Randy Dunlap).
      
         - Replace license boilerplate with an SPDX license ID in the ACPI
           PMIC operation region handling code (Rajmohan Mani)"
      
      * tag 'acpi-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (39 commits)
        ACPI: acpi_pad: Fix memory leak in power saving threads
        ACPI / video: Add quirk to force acpi-video backlight on Samsung 670Z5E
        ACPI: Add Time and Alarm Device (TAD) driver
        ACPI / scan: Send change uevent with offine environmental data
        ACPI / Kconfig: Update ACPI_PROCFS_POWER help text
        ACPI / OSI: Add OEM _OSI strings to disable NVidia RTD3
        ACPICA: Update version to 20180313
        ACPICA: Cleanup/simplify module-level code support
        ACPICA: Events: add a return on failure from acpi_hw_register_read
        ACPICA: adding SPDX headers
        ACPICA: Rename a global for clarity, no functional change
        ACPICA: macros: fix ACPI_ERROR_NAMESPACE macro
        ACPICA: Change a compile-time option to a runtime option
        ACPICA: Remove calling of _STA from acpi_get_object_info()
        ACPICA: AML Debug Object: Don't ignore output of zero-length strings
        ACPICA: Fix memory leak on unusual memory leak
        ACPICA: Events: Dispatch GPEs after enabling for the first time
        ACPICA: Events: Add parallel GPE handling support to fix potential redundant _Exx evaluations
        ACPICA: Events: Stop unconditionally clearing ACPI IRQs during suspend/resume
        ACPICA: acpi: acpica: fix acpi operand cache leak in nseval.c
        ...
      be553754
    • David S. Miller's avatar
      sparc64: Make atomic_xchg() an inline function rather than a macro. · d13864b6
      David S. Miller authored
      This avoids a lot of -Wunused warnings such as:
      
      ====================
      kernel/debug/debug_core.c: In function ‘kgdb_cpu_enter’:
      ./arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value]
       #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
      
      ./arch/sparc/include/asm/atomic_64.h:86:30: note: in expansion of macro ‘xchg’
       #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
                                    ^~~~
      kernel/debug/debug_core.c:508:4: note: in expansion of macro ‘atomic_xchg’
          atomic_xchg(&kgdb_active, cpu);
          ^~~~~~~~~~~
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d13864b6
    • Linus Torvalds's avatar
      Merge branch 'syscalls-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux · 642e7fd2
      Linus Torvalds authored
      Pull removal of in-kernel calls to syscalls from Dominik Brodowski:
       "System calls are interaction points between userspace and the kernel.
        Therefore, system call functions such as sys_xyzzy() or
        compat_sys_xyzzy() should only be called from userspace via the
        syscall table, but not from elsewhere in the kernel.
      
        At least on 64-bit x86, it will likely be a hard requirement from
        v4.17 onwards to not call system call functions in the kernel: It is
        better to use use a different calling convention for system calls
        there, where struct pt_regs is decoded on-the-fly in a syscall wrapper
        which then hands processing over to the actual syscall function. This
        means that only those parameters which are actually needed for a
        specific syscall are passed on during syscall entry, instead of
        filling in six CPU registers with random user space content all the
        time (which may cause serious trouble down the call chain). Those
        x86-specific patches will be pushed through the x86 tree in the near
        future.
      
        Moreover, rules on how data may be accessed may differ between kernel
        data and user data. This is another reason why calling sys_xyzzy() is
        generally a bad idea, and -- at most -- acceptable in arch-specific
        code.
      
        This patchset removes all in-kernel calls to syscall functions in the
        kernel with the exception of arch/. On top of this, it cleans up the
        three places where many syscalls are referenced or prototyped, namely
        kernel/sys_ni.c, include/linux/syscalls.h and include/linux/compat.h"
      
      * 'syscalls-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux: (109 commits)
        bpf: whitelist all syscalls for error injection
        kernel/sys_ni: remove {sys_,sys_compat} from cond_syscall definitions
        kernel/sys_ni: sort cond_syscall() entries
        syscalls/x86: auto-create compat_sys_*() prototypes
        syscalls: sort syscall prototypes in include/linux/compat.h
        net: remove compat_sys_*() prototypes from net/compat.h
        syscalls: sort syscall prototypes in include/linux/syscalls.h
        kexec: move sys_kexec_load() prototype to syscalls.h
        x86/sigreturn: use SYSCALL_DEFINE0
        x86: fix sys_sigreturn() return type to be long, not unsigned long
        x86/ioport: add ksys_ioperm() helper; remove in-kernel calls to sys_ioperm()
        mm: add ksys_readahead() helper; remove in-kernel calls to sys_readahead()
        mm: add ksys_mmap_pgoff() helper; remove in-kernel calls to sys_mmap_pgoff()
        mm: add ksys_fadvise64_64() helper; remove in-kernel call to sys_fadvise64_64()
        fs: add ksys_fallocate() wrapper; remove in-kernel calls to sys_fallocate()
        fs: add ksys_p{read,write}64() helpers; remove in-kernel calls to syscalls
        fs: add ksys_truncate() wrapper; remove in-kernel calls to sys_truncate()
        fs: add ksys_sync_file_range helper(); remove in-kernel calls to syscall
        kernel: add ksys_setsid() helper; remove in-kernel call to sys_setsid()
        kernel: add ksys_unshare() helper; remove in-kernel calls to sys_unshare()
        ...
      642e7fd2
    • Omar Sandoval's avatar
      bitmap: fix memset optimization on big-endian systems · 21035965
      Omar Sandoval authored
      Commit 2a98dc02 ("include/linux/bitmap.h: turn bitmap_set and
      bitmap_clear into memset when possible") introduced an optimization to
      bitmap_{set,clear}() which uses memset() when the start and length are
      constants aligned to a byte.
      
      This is wrong on big-endian systems; our bitmaps are arrays of unsigned
      long, so bit n is not at byte n / 8 in memory.  This was caught by the
      Btrfs selftests, but the bitmap selftests also fail when run on a
      big-endian machine.
      
      We can still use memset if the start and length are aligned to an
      unsigned long, so do that on big-endian.  The same problem applies to
      the memcmp in bitmap_equal(), so fix it there, too.
      
      Fixes: 2a98dc02 ("include/linux/bitmap.h: turn bitmap_set and bitmap_clear into memset when possible")
      Fixes: 2c6deb01 ("bitmap: use memcmp optimisation in more situations")
      Cc: stable@kernel.org
      Reported-by: default avatar"Erhard F." <erhard_f@mailbox.org>
      Cc: Matthew Wilcox <mawilcox@microsoft.com>
      Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarOmar Sandoval <osandov@fb.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      21035965
    • Linus Torvalds's avatar
      Merge tag 'arch-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic · f5a8eb63
      Linus Torvalds authored
      Pul removal of obsolete architecture ports from Arnd Bergmann:
       "This removes the entire architecture code for blackfin, cris, frv,
        m32r, metag, mn10300, score, and tile, including the associated device
        drivers.
      
        I have been working with the (former) maintainers for each one to
        ensure that my interpretation was right and the code is definitely
        unused in mainline kernels. Many had fond memories of working on the
        respective ports to start with and getting them included in upstream,
        but also saw no point in keeping the port alive without any users.
      
        In the end, it seems that while the eight architectures are extremely
        different, they all suffered the same fate: There was one company in
        charge of an SoC line, a CPU microarchitecture and a software
        ecosystem, which was more costly than licensing newer off-the-shelf
        CPU cores from a third party (typically ARM, MIPS, or RISC-V). It
        seems that all the SoC product lines are still around, but have not
        used the custom CPU architectures for several years at this point. In
        contrast, CPU instruction sets that remain popular and have actively
        maintained kernel ports tend to all be used across multiple licensees.
      
        [ See the new nds32 port merged in the previous commit for the next
          generation of "one company in charge of an SoC line, a CPU
          microarchitecture and a software ecosystem"   - Linus ]
      
        The removal came out of a discussion that is now documented at
        https://lwn.net/Articles/748074/. Unlike the original plans, I'm not
        marking any ports as deprecated but remove them all at once after I
        made sure that they are all unused. Some architectures (notably tile,
        mn10300, and blackfin) are still being shipped in products with old
        kernels, but those products will never be updated to newer kernel
        releases.
      
        After this series, we still have a few architectures without mainline
        gcc support:
      
         - unicore32 and hexagon both have very outdated gcc releases, but the
           maintainers promised to work on providing something newer. At least
           in case of hexagon, this will only be llvm, not gcc.
      
         - openrisc, risc-v and nds32 are still in the process of finishing
           their support or getting it added to mainline gcc in the first
           place. They all have patched gcc-7.3 ports that work to some
           degree, but complete upstream support won't happen before gcc-8.1.
           Csky posted their first kernel patch set last week, their situation
           will be similar
      
        [ Palmer Dabbelt points out that RISC-V support is in mainline gcc
          since gcc-7, although gcc-7.3.0 is the recommended minimum  - Linus ]"
      
      This really says it all:
      
       2498 files changed, 95 insertions(+), 467668 deletions(-)
      
      * tag 'arch-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: (74 commits)
        MAINTAINERS: UNICORE32: Change email account
        staging: iio: remove iio-trig-bfin-timer driver
        tty: hvc: remove tile driver
        tty: remove bfin_jtag_comm and hvc_bfin_jtag drivers
        serial: remove tile uart driver
        serial: remove m32r_sio driver
        serial: remove blackfin drivers
        serial: remove cris/etrax uart drivers
        usb: Remove Blackfin references in USB support
        usb: isp1362: remove blackfin arch glue
        usb: musb: remove blackfin port
        usb: host: remove tilegx platform glue
        pwm: remove pwm-bfin driver
        i2c: remove bfin-twi driver
        spi: remove blackfin related host drivers
        watchdog: remove bfin_wdt driver
        can: remove bfin_can driver
        mmc: remove bfin_sdh driver
        input: misc: remove blackfin rotary driver
        input: keyboard: remove bf54x driver
        ...
      f5a8eb63
    • Linus Torvalds's avatar
      Merge tag 'nds32-for-linus-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux · c9297d28
      Linus Torvalds authored
      Pull nds32 architecture support from Greentime Hu:
       "This contains the core nds32 Linux port (including interrupt
        controller driver and timer driver), which has been through seven
        rounds of review on mailing list.
      
        It is able to boot to shell and passes most LTP-2017 testsuites in
        nds32 AE3XX platform:
      
          Total Tests: 1901
          Total Skipped Tests: 618
          Total Failures: 78"
      Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
      
      * tag 'nds32-for-linus-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux: (44 commits)
        nds32: To use the generic dump_stack()
        nds32: fix building failed if using elf toolchain.
        nios2: add ioremap_nocache declaration before include asm-generic/io.h.
        nds32: fix building failed if using older version gcc.
        dt-bindings: timer: Add andestech atcpit100 timer binding doc
        clocksource/drivers/atcpit100: VDSO support
        clocksource/drivers/atcpit100: Add andestech atcpit100 timer
        net: faraday add nds32 support.
        irqchip: Andestech Internal Vector Interrupt Controller driver
        dt-bindings: interrupt-controller: Andestech Internal Vector Interrupt Controller
        dt-bindings: nds32 SoC Bindings
        dt-bindings: nds32 L2 cache controller Bindings
        dt-bindings: nds32 CPU Bindings
        MAINTAINERS: Add nds32
        nds32: Build infrastructure
        nds32: defconfig
        nds32: Miscellaneous header files
        nds32: Device tree support
        nds32: Generic timers support
        nds32: Loadable modules
        ...
      c9297d28
    • Linus Torvalds's avatar
      Merge tag 'm68k-for-v4.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 17e3cd22
      Linus Torvalds authored
      Pull m68k updates from Geert Uytterhoeven:
      
       - Macintosh enhancements and fixes
      
       - Remove useless memory layout printing using hashed pointers
      
       - Add missing Amiga Zorro bus DMA mask
      
       - Small fixes and cleanups
      
       - Defconfig updates
      
      * tag 'm68k-for-v4.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k/mac: Remove bogus "FIXME" comment
        m68k/mac: Enable RTC for 100-series PowerBooks
        m68k/mac: Clean up whitespace and remove redundant parentheses
        m68k/defconfig: Update defconfigs for v4.16-rc5
        zorro: Set up z->dev.dma_mask for the DMA API
        m68k/time: Stop validating rtc_time in .read_time
        m68k/mm: Stop printing the virtual memory layout
        macintosh/via-pmu68k: Initialize PMU driver with setup_arch and arch_initcall
        m68k/mac: Fix apparent race condition in Baboon interrupt dispatch
        m68k/mac: Enable PDMA support for PowerBook 190
      17e3cd22
    • Linus Torvalds's avatar
      Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · bc16d405
      Linus Torvalds authored
      Pull EFI updates from Ingo Molnar:
       "The main EFI changes in this cycle were:
      
         - Fix the apple-properties code (Andy Shevchenko)
      
         - Add WARN() on arm64 if UEFI Runtime Services corrupt the reserved
           x18 register (Ard Biesheuvel)
      
         - Use efi_switch_mm() on x86 instead of manipulating %cr3 directly
           (Sai Praneeth)
      
         - Fix early memremap leak in ESRT code (Ard Biesheuvel)
      
         - Switch to L"xxx" notation for wide string literals (Ard Biesheuvel)
      
         - ... plus misc other cleanups and bugfixes"
      
      * 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/efi: Use efi_switch_mm() rather than manually twiddling with %cr3
        x86/efi: Replace efi_pgd with efi_mm.pgd
        efi: Use string literals for efi_char16_t variable initializers
        efi/esrt: Fix handling of early ESRT table mapping
        efi: Use efi_mm in x86 as well as ARM
        efi: Make const array 'apple' static
        efi/apple-properties: Use memremap() instead of ioremap()
        efi: Reorder pr_notice() with add_device_randomness() call
        x86/efi: Replace GFP_ATOMIC with GFP_KERNEL in efi_query_variable_store()
        efi/arm64: Check whether x18 is preserved by runtime services calls
        efi/arm*: Stop printing addresses of virtual mappings
        efi/apple-properties: Remove redundant attribute initialization from unmarshal_key_value_pairs()
        efi/arm*: Only register page tables when they exist
      bc16d405
    • Linus Torvalds's avatar
      Merge branch 'x86-dma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2fcd2b30
      Linus Torvalds authored
      Pull x86 dma mapping updates from Ingo Molnar:
       "This tree, by Christoph Hellwig, switches over the x86 architecture to
        the generic dma-direct and swiotlb code, and also unifies more of the
        dma-direct code between architectures. The now unused x86-only
        primitives are removed"
      
      * 'x86-dma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        dma-mapping: Don't clear GFP_ZERO in dma_alloc_attrs
        swiotlb: Make swiotlb_{alloc,free}_buffer depend on CONFIG_DMA_DIRECT_OPS
        dma/swiotlb: Remove swiotlb_{alloc,free}_coherent()
        dma/direct: Handle force decryption for DMA coherent buffers in common code
        dma/direct: Handle the memory encryption bit in common code
        dma/swiotlb: Remove swiotlb_set_mem_attributes()
        set_memory.h: Provide set_memory_{en,de}crypted() stubs
        x86/dma: Remove dma_alloc_coherent_gfp_flags()
        iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()
        iommu/amd_iommu: Use CONFIG_DMA_DIRECT_OPS=y and dma_direct_{alloc,free}()
        x86/dma/amd_gart: Use dma_direct_{alloc,free}()
        x86/dma/amd_gart: Look at dev->coherent_dma_mask instead of GFP_DMA
        x86/dma: Use generic swiotlb_ops
        x86/dma: Use DMA-direct (CONFIG_DMA_DIRECT_OPS=y)
        x86/dma: Remove dma_alloc_coherent_mask()
      2fcd2b30
  3. 02 Apr, 2018 11 commits
    • Linus Torvalds's avatar
      Merge branch 'sched-wait-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ce6eba3d
      Linus Torvalds authored
      Pull wait_var_event updates from Ingo Molnar:
       "This introduces the new wait_var_event() API, which is a more flexible
        waiting primitive than wait_on_atomic_t().
      
        All wait_on_atomic_t() users are migrated over to the new API and
        wait_on_atomic_t() is removed. The migration fixes one bug and should
        result in no functional changes for the other usecases"
      
      * 'sched-wait-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/wait: Improve __var_waitqueue() code generation
        sched/wait: Remove the wait_on_atomic_t() API
        sched/wait, arch/mips: Fix and convert wait_on_atomic_t() usage to the new wait_var_event() API
        sched/wait, fs/ocfs2: Convert wait_on_atomic_t() usage to the new wait_var_event() API
        sched/wait, fs/nfs: Convert wait_on_atomic_t() usage to the new wait_var_event() API
        sched/wait, fs/fscache: Convert wait_on_atomic_t() usage to the new wait_var_event() API
        sched/wait, fs/btrfs: Convert wait_on_atomic_t() usage to the new wait_var_event() API
        sched/wait, fs/afs: Convert wait_on_atomic_t() usage to the new wait_var_event() API
        sched/wait, drivers/media: Convert wait_on_atomic_t() usage to the new wait_var_event() API
        sched/wait, drivers/drm: Convert wait_on_atomic_t() usage to the new wait_var_event() API
        sched/wait: Introduce wait_var_event()
      ce6eba3d
    • Linus Torvalds's avatar
      Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a5532439
      Linus Torvalds authored
      Pull x86 timer updates from Ingo Molnar:
       "Two changes: add the new convert_art_ns_to_tsc() API for upcoming
        Intel Goldmont+ drivers, and remove the obsolete rdtscll() API"
      
      * 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/tsc: Get rid of rdtscll()
        x86/tsc: Convert ART in nanoseconds to TSC
      a5532439
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · cea061e4
      Linus Torvalds authored
      Pull x86 platform updates from Ingo Molnar:
       "The main changes in this cycle were:
      
         - Add "Jailhouse" hypervisor support (Jan Kiszka)
      
         - Update DeviceTree support (Ivan Gorinov)
      
         - Improve DMI date handling (Andy Shevchenko)"
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/PCI: Fix a potential regression when using dmi_get_bios_year()
        firmware/dmi_scan: Uninline dmi_get_bios_year() helper
        x86/devicetree: Use CPU description from Device Tree
        of/Documentation: Specify local APIC ID in "reg"
        MAINTAINERS: Add entry for Jailhouse
        x86/jailhouse: Allow to use PCI_MMCONFIG without ACPI
        x86: Consolidate PCI_MMCONFIG configs
        x86: Align x86_64 PCI_MMCONFIG with 32-bit variant
        x86/jailhouse: Enable PCI mmconfig access in inmates
        PCI: Scan all functions when running over Jailhouse
        jailhouse: Provide detection for non-x86 systems
        x86/devicetree: Fix device IRQ settings in DT
        x86/devicetree: Initialize device tree before using it
        pci: Simplify code by using the new dmi_get_bios_year() helper
        ACPI/sleep: Simplify code by using the new dmi_get_bios_year() helper
        x86/pci: Simplify code by using the new dmi_get_bios_year() helper
        dmi: Introduce the dmi_get_bios_year() helper function
        x86/platform/quark: Re-use DEFINE_SHOW_ATTRIBUTE() macro
        x86/platform/atom: Re-use DEFINE_SHOW_ATTRIBUTE() macro
      cea061e4
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d22fff81
      Linus Torvalds authored
      Pull x86 mm updates from Ingo Molnar:
      
       - Extend the memmap= boot parameter syntax to allow the redeclaration
         and dropping of existing ranges, and to support all e820 range types
         (Jan H. Schönherr)
      
       - Improve the W+X boot time security checks to remove false positive
         warnings on Xen (Jan Beulich)
      
       - Support booting as Xen PVH guest (Juergen Gross)
      
       - Improved 5-level paging (LA57) support, in particular it's possible
         now to have a single kernel image for both 4-level and 5-level
         hardware (Kirill A. Shutemov)
      
       - AMD hardware RAM encryption support (SME/SEV) fixes (Tom Lendacky)
      
       - Preparatory commits for hardware-encrypted RAM support on Intel CPUs.
         (Kirill A. Shutemov)
      
       - Improved Intel-MID support (Andy Shevchenko)
      
       - Show EFI page tables in page_tables debug files (Andy Lutomirski)
      
       - ... plus misc fixes and smaller cleanups
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (56 commits)
        x86/cpu/tme: Fix spelling: "configuation" -> "configuration"
        x86/boot: Fix SEV boot failure from change to __PHYSICAL_MASK_SHIFT
        x86/mm: Update comment in detect_tme() regarding x86_phys_bits
        x86/mm/32: Remove unused node_memmap_size_bytes() & CONFIG_NEED_NODE_MEMMAP_SIZE logic
        x86/mm: Remove pointless checks in vmalloc_fault
        x86/platform/intel-mid: Add special handling for ACPI HW reduced platforms
        ACPI, x86/boot: Introduce the ->reduced_hw_early_init() ACPI callback
        ACPI, x86/boot: Split out acpi_generic_reduce_hw_init() and export
        x86/pconfig: Provide defines and helper to run MKTME_KEY_PROG leaf
        x86/pconfig: Detect PCONFIG targets
        x86/tme: Detect if TME and MKTME is activated by BIOS
        x86/boot/compressed/64: Handle 5-level paging boot if kernel is above 4G
        x86/boot/compressed/64: Use page table in trampoline memory
        x86/boot/compressed/64: Use stack from trampoline memory
        x86/boot/compressed/64: Make sure we have a 32-bit code segment
        x86/mm: Do not use paravirtualized calls in native_set_p4d()
        kdump, vmcoreinfo: Export pgtable_l5_enabled value
        x86/boot/compressed/64: Prepare new top-level page table for trampoline
        x86/boot/compressed/64: Set up trampoline memory
        x86/boot/compressed/64: Save and restore trampoline memory
        ...
      d22fff81
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 986b37c0
      Linus Torvalds authored
      Pull x86 cleanups and msr updates from Ingo Molnar:
       "The main change is a performance/latency improvement to /dev/msr
        access. The rest are misc cleanups"
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/msr: Make rdmsrl_safe_on_cpu() scheduling safe as well
        x86/cpuid: Allow cpuid_read() to schedule
        x86/msr: Allow rdmsr_safe_on_cpu() to schedule
        x86/rtc: Stop using deprecated functions
        x86/dumpstack: Unify show_regs()
        x86/fault: Do not print IP in show_fault_oops()
        x86/MSR: Move native_* variants to msr.h
      986b37c0
    • Linus Torvalds's avatar
      Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e68b4bad
      Linus Torvalds authored
      Pull x86 build updates from Ingo Molnar:
       "The biggest change is the forcing of asm-goto support on x86, which
        effectively increases the GCC minimum supported version to gcc-4.5 (on
        x86)"
      
      * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/build: Don't pass in -D__KERNEL__ multiple times
        x86: Remove FAST_FEATURE_TESTS
        x86: Force asm-goto
        x86/build: Drop superfluous ALIGN from the linker script
      e68b4bad
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5e46caf6
      Linus Torvalds authored
      Pull x86 asm fixlets from Ingo Molnar:
       "A clobber list fix and cleanups"
      
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/asm: Trim clear_page.S includes
        x86/asm: Clobber flags in clear_page()
      5e46caf6
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2451d1e5
      Linus Torvalds authored
      Pull x86 apic updates from Ingo Molnar:
       "The main x86 APIC/IOAPIC changes in this cycle were:
      
         - Robustify kexec support to more carefully restore IRQ hardware
           state before calling into kexec/kdump kernels. (Baoquan He)
      
         - Clean up the local APIC code a bit (Dou Liyang)
      
         - Remove unused callbacks (David Rientjes)"
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/apic: Finish removing unused callbacks
        x86/apic: Drop logical_smp_processor_id() inline
        x86/apic: Modernize the pending interrupt code
        x86/apic: Move pending interrupt check code into it's own function
        x86/apic: Set up through-local-APIC mode on the boot CPU if 'noapic' specified
        x86/apic: Rename variables and functions related to x86_io_apic_ops
        x86/apic: Remove the (now) unused disable_IO_APIC() function
        x86/apic: Fix restoring boot IRQ mode in reboot and kexec/kdump
        x86/apic: Split disable_IO_APIC() into two functions to fix CONFIG_KEXEC_JUMP=y
        x86/apic: Split out restore_boot_irq_mode() from disable_IO_APIC()
        x86/apic: Make setup_local_APIC() static
        x86/apic: Simplify init_bsp_APIC() usage
        x86/x2apic: Mark set_x2apic_phys_mode() as __init
      2451d1e5
    • Linus Torvalds's avatar
      Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 67dbfc14
      Linus Torvalds authored
      Pull SMP hotplug updates from Ingo Molnar:
       "Simplify the CPU hot-plug state machine"
      
      * 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        cpu/hotplug: Fix unused function warning
        cpu/hotplug: Merge cpuhp_bp_states and cpuhp_ap_states
      67dbfc14
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 46e0d28b
      Linus Torvalds authored
      Pull scheduler updates from Ingo Molnar:
       "The main scheduler changes in this cycle were:
      
         - NUMA balancing improvements (Mel Gorman)
      
         - Further load tracking improvements (Patrick Bellasi)
      
         - Various NOHZ balancing cleanups and optimizations (Peter Zijlstra)
      
         - Improve blocked load handling, in particular we can now reduce and
           eventually stop periodic load updates on 'very idle' CPUs. (Vincent
           Guittot)
      
         - On isolated CPUs offload the final 1Hz scheduler tick as well, plus
           related cleanups and reorganization. (Frederic Weisbecker)
      
         - Core scheduler code cleanups (Ingo Molnar)"
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (45 commits)
        sched/core: Update preempt_notifier_key to modern API
        sched/cpufreq: Rate limits for SCHED_DEADLINE
        sched/fair: Update util_est only on util_avg updates
        sched/cpufreq/schedutil: Use util_est for OPP selection
        sched/fair: Use util_est in LB and WU paths
        sched/fair: Add util_est on top of PELT
        sched/core: Remove TASK_ALL
        sched/completions: Use bool in try_wait_for_completion()
        sched/fair: Update blocked load when newly idle
        sched/fair: Move idle_balance()
        sched/nohz: Merge CONFIG_NO_HZ_COMMON blocks
        sched/fair: Move rebalance_domains()
        sched/nohz: Optimize nohz_idle_balance()
        sched/fair: Reduce the periodic update duration
        sched/nohz: Stop NOHZ stats when decayed
        sched/cpufreq: Provide migration hint
        sched/nohz: Clean up nohz enter/exit
        sched/fair: Update blocked load from NEWIDLE
        sched/fair: Add NOHZ stats balancing
        sched/fair: Restructure nohz_balance_kick()
        ...
      46e0d28b
    • Linus Torvalds's avatar
      Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 86bbbeba
      Linus Torvalds authored
      Pull x86 RAS updates from Ingo Molnar:
       "The main changes in this cycle were:
      
         - AMD MCE support/decoding improvements (Yazen Ghannam)
      
         - general MCE header cleanups and reorganization (Borislav Petkov)"
      
      * 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        Revert "x86/mce/AMD: Collect error info even if valid bits are not set"
        x86/MCE: Cleanup and complete struct mce fields definitions
        x86/mce/AMD: Carve out SMCA get_block_address() code
        x86/mce/AMD: Get address from already initialized block
        x86/mce/AMD, EDAC/mce_amd: Enumerate Reserved SMCA bank type
        x86/mce/AMD: Pass the bank number to smca_get_bank_type()
        x86/mce/AMD: Collect error info even if valid bits are not set
        x86/mce: Issue the 'mcelog --ascii' message only on !AMD
        x86/mce: Convert 'struct mca_config' bools to a bitfield
        x86/mce: Put private structures and definitions into the internal header
      86bbbeba