Skip to content
  1. May 06, 2021
    • Linus Torvalds's avatar
      Merge tag 'nfsd-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux · a79cdfba
      Linus Torvalds authored
      Pull more nfsd updates from Chuck Lever:
       "Additional fixes and clean-ups for NFSD since tags/nfsd-5.13,
        including a fix to grant read delegations for files open for writing"
      
      * tag 'nfsd-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
        SUNRPC: Fix null pointer dereference in svc_rqst_free()
        SUNRPC: fix ternary sign expansion bug in tracing
        nfsd: Fix fall-through warnings for Clang
        nfsd: grant read delegations to clients holding writes
        nfsd: reshuffle some code
        nfsd: track filehandle aliasing in nfs4_files
        nfsd: hash nfs4_files by inode number
        nfsd: ensure new clients break delegations
        nfsd: removed unused argument in nfsd_startup_generic()
        nfsd: remove unused function
        svcrdma: Pass a useful error code to the send_err tracepoint
        svcrdma: Rename goto labels in svc_rdma_sendto()
        svcrdma: Don't leak send_ctxt on Send errors
      a79cdfba
    • Linus Torvalds's avatar
      Merge tag '5.13-rc-smb3-part2' of git://git.samba.org/sfrench/cifs-2.6 · 7c9e41e0
      Linus Torvalds authored
      Pull cifs updates from Steve French:
       "Ten CIFS/SMB3 changes - including two marked for stable - including
        some important multichannel fixes, as well as support for handle
        leases (deferred close) and shutdown support:
      
         - some important multichannel fixes
      
         - support for handle leases (deferred close)
      
         - shutdown support (which is also helpful since it enables multiple
           xfstests)
      
         - enable negotiating stronger encryption by default (GCM256)
      
         - improve wireshark debugging by allowing more options for root to
           dump decryption keys
      
        SambaXP and the SMB3 Plugfest test event are going on now so I am
        expecting more patches over the next few days due to extra testing
        (including more multichannel fixes)"
      
      * tag '5.13-rc-smb3-part2' of git://git.samba.org/sfrench/cifs-2.6:
        fs/cifs: Fix resource leak
        Cifs: Fix kernel oops caused by deferred close for files.
        cifs: fix regression when mounting shares with prefix paths
        cifs: use echo_interval even when connection not ready.
        cifs: detect dead connections only when echoes are enabled.
        smb3.1.1: allow dumping keys for multiuser mounts
        smb3.1.1: allow dumping GCM256 keys to improve debugging of encrypted shares
        cifs: add shutdown support
        cifs: Deferred close for files
        smb3.1.1: enable negotiating stronger encryption by default
      7c9e41e0
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 16bb86b5
      Linus Torvalds authored
      Pull virtio updates from Michael Tsirkin:
       "A bunch of new drivers including vdpa support for block and
        virtio-vdpa.
      
        Beginning of vq kick (aka doorbell) mapping support.
      
        Misc fixes"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (40 commits)
        virtio_pci_modern: correct sparse tags for notify
        virtio_pci_modern: __force cast the notify mapping
        vDPA/ifcvf: get_config_size should return dev specific config size
        vDPA/ifcvf: enable Intel C5000X-PL virtio-block for vDPA
        vDPA/ifcvf: deduce VIRTIO device ID when probe
        vdpa_sim_blk: add support for vdpa management tool
        vdpa_sim_blk: handle VIRTIO_BLK_T_GET_ID
        vdpa_sim_blk: implement ramdisk behaviour
        vdpa: add vdpa simulator for block device
        vhost/vdpa: Remove the restriction that only supports virtio-net devices
        vhost/vdpa: use get_config_size callback in vhost_vdpa_config_validate()
        vdpa: add get_config_size callback in vdpa_config_ops
        vdpa_sim: cleanup kiovs in vdpasim_free()
        vringh: add vringh_kiov_length() helper
        vringh: implement vringh_kiov_advance()
        vringh: explain more about cleaning riov and wiov
        vringh: reset kiov 'consumed' field in __vringh_iov()
        vringh: add 'iotlb_lock' to synchronize iotlb accesses
        vdpa_sim: use iova module to allocate IOVA addresses
        vDPA/ifcvf: deduce VIRTIO device ID from pdev ids
        ...
      16bb86b5
    • Linus Torvalds's avatar
      Merge tag 'pci-v5.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 57151b50
      Linus Torvalds authored
      Pull pci updates from Bjorn Helgaas:
       "Enumeration:
         - Release OF node when pci_scan_device() fails (Dmitry Baryshkov)
         - Add pci_disable_parity() (Bjorn Helgaas)
         - Disable Mellanox Tavor parity reporting (Heiner Kallweit)
         - Disable N2100 r8169 parity reporting (Heiner Kallweit)
         - Fix RCiEP device to RCEC association (Qiuxu Zhuo)
         - Convert sysfs "config", "rom", "reset", "label", "index",
           "acpi_index" to static attributes to help fix races in device
           enumeration (Krzysztof Wilczyński)
         - Convert sysfs "vpd" to static attribute (Heiner Kallweit, Krzysztof
           Wilczyński)
         - Use sysfs_emit() in "show" functions (Krzysztof Wilczyński)
         - Remove unused alloc_pci_root_info() return value (Krzysztof
           Wilczyński)
      
        PCI device hotplug:
         - Fix acpiphp reference count leak (Feilong Lin)
      
        Power management:
         - Fix acpi_pci_set_power_state() debug message (Rafael J. Wysocki)
         - Fix runtime PM imbalance (Dinghao Liu)
      
        Virtualization:
         - Increase delay after FLR to work around Intel DC P4510 NVMe erratum
           (Raphael Norwitz)
      
        MSI:
         - Convert rcar, tegra, xilinx to MSI domains (Marc Zyngier)
         - For rcar, xilinx, use controller address as MSI doorbell (Marc
           Zyngier)
         - Remove unused hv msi_controller struct (Marc Zyngier)
         - Remove unused PCI core msi_controller support (Marc Zyngier)
         - Remove struct msi_controller altogether (Marc Zyngier)
         - Remove unused default_teardown_msi_irqs() (Marc Zyngier)
         - Let host bridges declare their reliance on MSI domains (Marc
           Zyngier)
         - Make pci_host_common_probe() declare its reliance on MSI domains
           (Marc Zyngier)
         - Advertise mediatek lack of built-in MSI handling (Thomas Gleixner)
         - Document ways of ending up with NO_MSI (Marc Zyngier)
         - Refactor HT advertising of NO_MSI flag (Marc Zyngier)
      
        VPD:
         - Remove obsolete Broadcom NIC VPD length-limiting quirk (Heiner
           Kallweit)
         - Remove sysfs VPD size checking dead code (Heiner Kallweit)
         - Convert VPF sysfs file to static attribute (Heiner Kallweit)
         - Remove unnecessary pci_set_vpd_size() (Heiner Kallweit)
         - Tone down "missing VPD" message (Heiner Kallweit)
      
        Endpoint framework:
         - Fix NULL pointer dereference when epc_features not implemented
           (Shradha Todi)
         - Add missing destroy_workqueue() in endpoint test (Yang Yingliang)
      
        Amazon Annapurna Labs PCIe controller driver:
         - Fix compile testing without CONFIG_PCI_ECAM (Arnd Bergmann)
         - Fix "no symbols" warnings when compile testing with
           CONFIG_TRIM_UNUSED_KSYMS (Arnd Bergmann)
      
        APM X-Gene PCIe controller driver:
         - Fix cfg resource mapping regression (Dejin Zheng)
      
        Broadcom iProc PCIe controller driver:
         - Return zero for success of iproc_msi_irq_domain_alloc() (Pali
           Rohár)
      
        Broadcom STB PCIe controller driver:
         - Add reset_control_rearm() stub for !CONFIG_RESET_CONTROLLER (Jim
           Quinlan)
         - Fix use of BCM7216 reset controller (Jim Quinlan)
         - Use reset/rearm for Broadcom STB pulse reset instead of
           deassert/assert (Jim Quinlan)
         - Fix brcm_pcie_probe() error return for unsupported revision (Wei
           Yongjun)
      
        Cavium ThunderX PCIe controller driver:
         - Fix compile testing (Arnd Bergmann)
         - Fix "no symbols" warnings when compile testing with
           CONFIG_TRIM_UNUSED_KSYMS (Arnd Bergmann)
      
        Freescale Layerscape PCIe controller driver:
         - Fix ls_pcie_ep_probe() syntax error (comma for semicolon)
           (Krzysztof Wilczyński)
         - Remove layerscape-gen4 dependencies on OF and ARM64, add dependency
           on ARCH_LAYERSCAPE (Geert Uytterhoeven)
      
        HiSilicon HIP PCIe controller driver:
         - Remove obsolete HiSilicon PCIe DT description (Dongdong Liu)
      
        Intel Gateway PCIe controller driver:
         - Remove unused pcie_app_rd() (Jiapeng Chong)
      
        Intel VMD host bridge driver:
         - Program IRTE with Requester ID of VMD endpoint, not child device
           (Jon Derrick)
         - Disable VMD MSI-X remapping when possible so children can use more
           MSI-X vectors (Jon Derrick)
      
        MediaTek PCIe controller driver:
         - Configure FC and FTS for functions other than 0 (Ryder Lee)
         - Add YAML schema for MediaTek (Jianjun Wang)
         - Export pci_pio_to_address() for module use (Jianjun Wang)
         - Add MediaTek MT8192 PCIe controller driver (Jianjun Wang)
         - Add MediaTek MT8192 INTx support (Jianjun Wang)
         - Add MediaTek MT8192 MSI support (Jianjun Wang)
         - Add MediaTek MT8192 system power management support (Jianjun Wang)
         - Add missing MODULE_DEVICE_TABLE (Qiheng Lin)
      
        Microchip PolarFlare PCIe controller driver:
         - Make several symbols static (Wei Yongjun)
      
        NVIDIA Tegra PCIe controller driver:
         - Add MCFG quirks for Tegra194 ECAM errata (Vidya Sagar)
         - Make several symbols const (Rikard Falkeborn)
         - Fix Kconfig host/endpoint typo (Wesley Sheng)
      
        SiFive FU740 PCIe controller driver:
         - Add pcie_aux clock to prci driver (Greentime Hu)
         - Use reset-simple in prci driver for PCIe (Greentime Hu)
         - Add SiFive FU740 PCIe host controller driver and DT binding (Paul
           Walmsley, Greentime Hu)
      
        Synopsys DesignWare PCIe controller driver:
         - Move MSI Receiver init to dw_pcie_host_init() so it is
           re-initialized along with the RC in resume (Jisheng Zhang)
         - Move iATU detection earlier to fix regression (Hou Zhiqiang)
      
        TI J721E PCIe driver:
         - Add DT binding and TI j721e support for refclk to PCIe connector
           (Kishon Vijay Abraham I)
         - Add host mode and endpoint mode DT bindings for TI AM64 SoC (Kishon
           Vijay Abraham I)
      
        TI Keystone PCIe controller driver:
         - Use generic config accessors for TI AM65x (K3) to fix regression
           (Kishon Vijay Abraham I)
      
        Xilinx NWL PCIe controller driver:
         - Add support for coherent PCIe DMA traffic using CCI (Bharat Kumar
           Gogada)
         - Add optional "dma-coherent" DT property (Bharat Kumar Gogada)
      
        Miscellaneous:
         - Fix kernel-doc warnings (Krzysztof Wilczyński)
         - Remove unused MicroGate SyncLink device IDs (Jiri Slaby)
         - Remove redundant dev_err() for devm_ioremap_resource() failure
           (Chen Hui)
         - Remove redundant initialization (Colin Ian King)
         - Drop redundant dev_err() for platform_get_irq() errors (Krzysztof
           Wilczyński)"
      
      * tag 'pci-v5.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (98 commits)
        riscv: dts: Add PCIe support for the SiFive FU740-C000 SoC
        PCI: fu740: Add SiFive FU740 PCIe host controller driver
        dt-bindings: PCI: Add SiFive FU740 PCIe host controller
        MAINTAINERS: Add maintainers for SiFive FU740 PCIe driver
        clk: sifive: Use reset-simple in prci driver for PCIe driver
        clk: sifive: Add pcie_aux clock in prci driver for PCIe driver
        PCI: brcmstb: Use reset/rearm instead of deassert/assert
        ata: ahci_brcm: Fix use of BCM7216 reset controller
        reset: add missing empty function reset_control_rearm()
        PCI: Allow VPD access for QLogic ISP2722
        PCI/VPD: Add helper pci_get_func0_dev()
        PCI/VPD: Remove pci_vpd_find_tag() SRDT handling
        PCI/VPD: Remove pci_vpd_find_tag() 'offset' argument
        PCI/VPD: Change pci_vpd_init() return type to void
        PCI/VPD: Make missing VPD message less alarming
        PCI/VPD: Remove pci_set_vpd_size()
        x86/PCI: Remove unused alloc_pci_root_info() return value
        MAINTAINERS: Add Jianjun Wang as MediaTek PCI co-maintainer
        PCI: mediatek-gen3: Add system PM support
        PCI: mediatek-gen3: Add MSI support
        ...
      57151b50
    • Linus Torvalds's avatar
      Merge tag 'pwm/for-5.13-rc1' of... · 7b9df264
      Linus Torvalds authored
      Merge tag 'pwm/for-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "This adds support for the PWM controller found on Toshiba Visconti
        SoCs and converts a couple of drivers to the atomic API.
      
        There's also a bunch of cleanups and minor fixes across the board"
      
      * tag 'pwm/for-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (35 commits)
        pwm: Reword docs about pwm_apply_state()
        pwm: atmel: Improve duty cycle calculation in .apply()
        pwm: atmel: Fix duty cycle calculation in .get_state()
        pwm: visconti: Add Toshiba Visconti SoC PWM support
        dt-bindings: pwm: Add bindings for Toshiba Visconti PWM Controller
        arm64: dts: rockchip: Remove clock-names from PWM nodes
        ARM: dts: rockchip: Remove clock-names from PWM nodes
        dt-bindings: pwm: rockchip: Add more compatible strings
        dt-bindings: pwm: Convert pwm-rockchip.txt to YAML
        pwm: mediatek: Remove unused function
        pwm: pca9685: Improv...
      7b9df264
    • Linus Torvalds's avatar
      Merge tag 'thermal-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux · 583f2bcf
      Linus Torvalds authored
      Pull thermal updates from Daniel Lezcano:
      
       - Remove duplicate error message for the amlogic driver (Tang Bin)
      
       - Fix spellos in comments for the tegra and sun8i (Bhaskar Chowdhury)
      
       - Add the missing fifth node on the rcar_gen3 sensor (Niklas Söderlund)
      
       - Remove duplicate include in ti-bandgap (Zhang Yunkai)
      
       - Assign error code in the error path in the function
         thermal_of_populate_bind_params() (Jia-Ju Bai)
      
       - Fix spelling mistake in a comment 'disabed' -> 'disabled' (Colin Ian
         King)
      
       - Use the device name instead of auto-numbering for a better
         identification of the cooling device (Daniel Lezcano)
      
       - Improve a bit the division accuracy in the power allocator governor
         (Jeson Gao)
      
       - Enable the missing third sensor on msm8976 (Konrad Dybcio)
      
       - Add QCom tsens driver co-maintainer (Thara Gopinath)
      
       - Fix memory leak and use after free errors in the core code (Daniel
         Lezcano)
      
       - Add the MDM9607 compatible bindings (Konrad Dybcio)
      
       - Fix trivial spello in the copyright name for Hisilicon (Hao Fang)
      
       - Fix negative index array access when converting the frequency to
         power in the energy model (Brian-sy Yang)
      
       - Add support for Gen2 new PMIC support for Qcom SPMI (David Collins)
      
       - Update maintainer file for CPU cooling device section (Lukasz Luba)
      
       - Fix missing put_device on error in the Qcom tsens driver (Guangqing
         Zhu)
      
       - Add compatible DT binding for sm8350 (Robert Foss)
      
       - Add support for the MDM9607's tsens driver (Konrad Dybcio)
      
       - Remove duplicate error messages in thermal_mmio and the bcm2835
         driver (Ruiqi Gong)
      
       - Add the Thermal Temperature Cooling driver (Zhang Rui)
      
       - Remove duplicate error messages in the Hisilicon sensor driver (Ye
         Bin)
      
       - Use the devm_platform_ioremap_resource_byname() function instead of a
         couple of corresponding calls (dingsenjie)
      
       - Sort the headers alphabetically in the ti-bandgap driver (Zhen Lei)
      
       - Add missing property in the DT thermal sensor binding (Rafał Miłecki)
      
       - Remove dead code in the ti-bandgap sensor driver (Lin Ruizhe)
      
       - Convert the BRCM DT bindings to the yaml schema (Rafał Miłecki)
      
       - Replace the thermal_notify_framework() call by a call to the
         thermal_zone_device_update() function. Remove the function as well as
         the corresponding documentation (Thara Gopinath)
      
       - Add support for the ipq8064-tsens sensor along with a set of cleanups
         and code preparation (Ansuel Smith)
      
       - Add a lockless __thermal_cdev_update() function to improve the
         locking scheme in the core code and governors (Lukasz Luba)
      
       - Fix multiple cooling device notification changes (Lukasz Luba)
      
       - Remove unneeded variable initialization (Colin Ian King)
      
      * tag 'thermal-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux: (55 commits)
        thermal/drivers/mtk_thermal: Remove redundant initializations of several variables
        thermal/core/power allocator: Use the lockless __thermal_cdev_update() function
        thermal/core/fair share: Use the lockless __thermal_cdev_update() function
        thermal/core/fair share: Lock the thermal zone while looping over instances
        thermal/core/power_allocator: Update once cooling devices when temp is low
        thermal/core/power_allocator: Maintain the device statistics from going stale
        thermal/core: Create a helper __thermal_cdev_update() without a lock
        dt-bindings: thermal: tsens: Document ipq8064 bindings
        thermal/drivers/tsens: Add support for ipq8064-tsens
        thermal/drivers/tsens: Drop unused define for msm8960
        thermal/drivers/tsens: Replace custom 8960 apis with generic apis
        thermal/drivers/tsens: Fix bug in sensor enable for msm8960
        thermal/drivers/tsens: Use init_common for msm8960
        thermal/drivers/tsens: Add VER_0 tsens version
        thermal/drivers/tsens: Convert msm8960 to reg_field
        thermal/drivers/tsens: Don't hardcode sensor slope
        Documentation: driver-api: thermal: Remove thermal_notify_framework from documentation
        thermal/core: Remove thermal_notify_framework
        iwlwifi: mvm: tt: Replace thermal_notify_framework
        dt-bindings: thermal: brcm,ns-thermal: Convert to the json-schema
        ...
      583f2bcf
    • Linus Torvalds's avatar
      Merge tag 'gpio-updates-for-v5.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux · 5d6a1b84
      Linus Torvalds authored
      Pull gpio updates from Bartosz Golaszewski:
      
       - new driver for the Realtek Otto GPIO controller
      
       - ACPI support for gpio-mpc8xxx
      
       - edge event support for gpio-sch (+ Kconfig fixes)
      
       - Kconfig improvements in gpio-ich
      
       - fixes to older issues in gpio-mockup
      
       - ACPI quirk for ignoring EC wakeups on Dell Venue 10 Pro 5055
      
       - improve the GPIO aggregator code by using more generic interfaces
         instead of reimplementing them in the driver
      
       - convert the DT bindings for gpio-74x164 to yaml
      
       - documentation improvements
      
       - a slew of other minor fixes and improvements to GPIO drivers
      
      * tag 'gpio-updates-for-v5.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: (34 commits)
        dt-bindings: gpio: add YAML description for rockchip,gpio-bank
        gpio: mxs: remove useless function
        dt-bindings: gpio: fairchild,74hc595: Convert to json-schema
        gpio: it87: remove unused code
        gpio: 104-dio-48e: Fix coding style issues
        gpio: mpc8xxx: Add ACPI support
        gpio: ich: Switch to be dependent on LPC_ICH
        gpio: sch: Drop MFD_CORE selection
        gpio: sch: depends on LPC_SCH
        gpiolib: acpi: Add quirk to ignore EC wakeups on Dell Venue 10 Pro 5055
        gpio: sch: Hook into ACPI GPE handler to catch GPIO edge events
        gpio: sch: Add edge event support
        gpio: aggregator: Replace custom get_arg() with a generic next_arg()
        lib/cmdline: Export next_arg() for being used in modules
        gpio: omap: Use device_get_match_data() helper
        gpio: Add Realtek Otto GPIO support
        dt-bindings: gpio: Binding for Realtek Otto GPIO
        docs: kernel-parameters: Add gpio_mockup_named_lines
        docs: kernel-parameters: Move gpio-mockup for alphabetic order
        lib: bitmap: provide devm_bitmap_alloc() and devm_bitmap_zalloc()
        ...
      5d6a1b84
    • Linus Torvalds's avatar
      Merge tag 'char-misc-5.13-rc1-round2' of... · 5a5bcd43
      Linus Torvalds authored
      Merge tag 'char-misc-5.13-rc1-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
      
      Pull char/misc driver fixes from Greg KH:
       "Here are two char/misc fixes for 5.13-rc1 to resolve reported issues.
      
        The first is a bugfix for the nitro_enclaves driver that fixed some
        important problems. The second was a dyndbg bugfix that resolved some
        reported problems in dynamic debugging control.
      
        Both have been in linux-next for a while with no reported issues"
      
      * tag 'char-misc-5.13-rc1-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        dyndbg: fix parsing file query without a line-range suffix
        nitro_enclaves: Fix stale file descriptors on failed usercopy
      5a5bcd43
    • Linus Torvalds's avatar
      Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux · d8cb379c
      Linus Torvalds authored
      Pull turbostat updates from Len Brown:
       "Bug fixes and a smattering of features"
      
      * 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (21 commits)
        tools/power turbostat: version 2021.05.04
        tools/power turbostat: Support "turbostat --hide idle"
        tools/power turbostat: elevate priority of interval mode
        tools/power turbostat: formatting
        tools/power turbostat: rename tcc variables
        tools/power turbostat: add TCC Offset support
        tools/power turbostat: save original CPU model
        tools/power turbostat: Fix Core C6 residency on Atom CPUs
        tools/power turbostat: Print the C-state Pre-wake settings
        tools/power turbostat: Enable tsc_tweak for Elkhart Lake and Jasper Lake
        tools/power turbostat: unmark non-kernel-doc comment
        tools/power/turbostat: Remove Package C6 Retention on Ice Lake Server
        tools/power turbostat: Fix offset overflow issue in index converting
        tools/power/turbostat: Fix turbostat for AMD Zen CPUs
        tools/power turbostat: update version number
        tools/power turbostat: Fix DRAM Energy Unit on SKX
        Revert "tools/power turbostat: adjust for temperature offset"
        tools/power turbostat: Support Ice Lake D
        tools/power turbostat: Support Alder Lake Mobile
        tools/power turbostat: print microcode patch level
        ...
      d8cb379c
    • Linus Torvalds's avatar
      Merge tag 'ktest-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest · dd8c86c6
      Linus Torvalds authored
      Pull ktest updates from Steven Rostedt:
      
       - Added a KTEST section in the MAINTAINERS file
      
       - Included John Hawley as a co-maintainer
      
       - Add an example config that would work with VMware workstation guests
      
       - Cleanups to the code
      
      * tag 'ktest-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
        ktest: Add KTEST section to MAINTAINERS file
        ktest: Re-arrange the code blocks for better discoverability
        ktest: Further consistency cleanups
        ktest: Fixing indentation to match expected pattern
        ktest: Adding editor hints to improve consistency
        ktest: Add example config for using VMware VMs
        ktest: Minor cleanup with uninitialized variable $build_options
      dd8c86c6
    • Linus Torvalds's avatar
      Merge tag 'safesetid-5.13' of git://github.com/micah-morton/linux · d29c9bb0
      Linus Torvalds authored
      Pull SafeSetID update from Micah Morton:
       "Simple code cleanup
      
        This just has a single three-line code cleanup to eliminate some
        unnecessary 'break' statements"
      
      * tag 'safesetid-5.13' of git://github.com/micah-morton/linux:
        LSM: SafeSetID: Fix code specification by scripts/checkpatch.pl
      d29c9bb0
  2. May 05, 2021