Commit 9e04ff70 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'v5.7-rc2' into patchwork 

Linux 5.7-rc2

* tag 'v5.7-rc2': (331 commits)
  Linux 5.7-rc2
  mm: Fix MREMAP_DONTUNMAP accounting on VMA merge
  xattr.h: Replace zero-length array with flexible-array member
  uapi: linux: fiemap.h: Replace zero-length array with flexible-array member
  uapi: linux: dlm_device.h: Replace zero-length array with flexible-array member
  tpm_eventlog.h: Replace zero-length array with flexible-array member
  ti_wilink_st.h: Replace zero-length array with flexible-array member
  swap.h: Replace zero-length array with flexible-array member
  skbuff.h: Replace zero-length array with flexible-array member
  sched: topology.h: Replace zero-length array with flexible-array member
  rslib.h: Replace zero-length array with flexible-array member
  rio.h: Replace zero-length array with flexible-array member
  posix_acl.h: Replace zero-length array with flexible-array member
  platform_data: wilco-ec.h: Replace zero-length array with flexible-array member
  memcontrol.h: Replace zero-length array with flexible-array member
  list_lru.h: Replace zero-length array with flexible-array member
  lib: cpu_rmap: Replace zero-length array with flexible-array member
  irq.h: Replace zero-length array with flexible-array member
  ihex.h: Replace zero-length array with flexible-array member
  igmp.h: Replace zero-length array with flexible-array member
  ...
parents ceab3ac1 ae83d0b4

Documentation/admin-guide/sysctl/kernel.rst

+19 −28
Original line number Diff line number Diff line
@@ -390,9 +390,17 @@ When ``kptr_restrict`` is set to 2, kernel pointers printed using 
modprobe

========



This gives the full path of the modprobe command which the kernel will

use to load modules. This can be used to debug module loading

requests::

The full path to the usermode helper for autoloading kernel modules,

by default "/sbin/modprobe".  This binary is executed when the kernel

requests a module.  For example, if userspace passes an unknown

filesystem type to mount(), then the kernel will automatically request

the corresponding filesystem module by executing this usermode helper.

This usermode helper should insert the needed module into the kernel.



This sysctl only affects module autoloading.  It has no effect on the

ability to explicitly insert modules.



This sysctl can be used to debug module loading requests::



    echo '#! /bin/sh' > /tmp/modprobe

    echo 'echo "$@" >> /tmp/modprobe.log' >> /tmp/modprobe
@@ -400,10 +408,15 @@ requests:: 
    chmod a+x /tmp/modprobe

    echo /tmp/modprobe > /proc/sys/kernel/modprobe



This only applies when the *kernel* is requesting that the module be

loaded; it won't have any effect if the module is being loaded

explicitly using ``modprobe`` from userspace.

Alternatively, if this sysctl is set to the empty string, then module

autoloading is completely disabled.  The kernel will not try to

execute a usermode helper at all, nor will it call the

kernel_module_request LSM hook.



If CONFIG_STATIC_USERMODEHELPER=y is set in the kernel configuration,

then the configured static usermode helper overrides this sysctl,

except that the empty string is still accepted to completely disable

module autoloading as described above.



modules_disabled

================
@@ -446,28 +459,6 @@ Notes: 
     successful IPC object allocation. If an IPC object allocation syscall

     fails, it is undefined if the value remains unmodified or is reset to -1.



modprobe:

=========



The path to the usermode helper for autoloading kernel modules, by

default "/sbin/modprobe".  This binary is executed when the kernel

requests a module.  For example, if userspace passes an unknown

filesystem type to mount(), then the kernel will automatically request

the corresponding filesystem module by executing this usermode helper.

This usermode helper should insert the needed module into the kernel.



This sysctl only affects module autoloading.  It has no effect on the

ability to explicitly insert modules.



If this sysctl is set to the empty string, then module autoloading is

completely disabled.  The kernel will not try to execute a usermode

helper at all, nor will it call the kernel_module_request LSM hook.



If CONFIG_STATIC_USERMODEHELPER=y is set in the kernel configuration,

then the configured static usermode helper overrides this sysctl,

except that the empty string is still accepted to completely disable

module autoloading as described above.



nmi_watchdog

============

Documentation/core-api/timekeeping.rst

+3 −3
Original line number Diff line number Diff line
@@ -154,9 +154,9 @@ architectures. These are the recommended replacements: 


	Use ktime_get() or ktime_get_ts64() instead.



.. c:function:: struct timeval do_gettimeofday( void )

		struct timespec getnstimeofday( void )

		struct timespec64 getnstimeofday64( void )

.. c:function:: void do_gettimeofday( struct timeval * )

		void getnstimeofday( struct timespec * )

		void getnstimeofday64( struct timespec64 * )

		void ktime_get_real_ts( struct timespec * )



	ktime_get_real_ts64() is a direct replacement, but consider using

Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ properties: 
    description:

      See section 2.3.9 of the DeviceTree Specification.



  '#address-cells': true



  '#size-cells': true



required:

  - "#interconnect-cells"

  - compatible
@@ -59,6 +63,8 @@ examples: 
        compatible = "allwinner,sun5i-a13-mbus";

        reg = <0x01c01000 0x1000>;

        clocks = <&ccu CLK_MBUS>;

        #address-cells = <1>;

        #size-cells = <1>;

        dma-ranges = <0x00000000 0x40000000 0x20000000>;

        #interconnect-cells = <1>;

    };

Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ required: 


examples:

  - |

    vco1: clock@00 {

    vco1: clock {

      compatible = "arm,impd1-vco1";

      #clock-cells = <0>;

      lock-offset = <0x08>;

Documentation/devicetree/bindings/display/bridge/adi,adv7123.txt

+2 −2
Original line number Diff line number Diff line 
Analog Device ADV7123 Video DAC

-------------------------------

Analog Devices ADV7123 Video DAC

--------------------------------



The ADV7123 is a digital-to-analog converter that outputs VGA signals from a

parallel video input.