Commit 0ab8009b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core 



To pick up fixes from perf/urgent to allow perf/core to be used for new
development.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 79e157b0 c2131f7e

Documentation/admin-guide/sysctl/kernel.rst

+14 −3
Original line number Diff line number Diff line
@@ -1458,11 +1458,22 @@ unprivileged_bpf_disabled 
=========================



Writing 1 to this entry will disable unprivileged calls to ``bpf()``;

once disabled, calling ``bpf()`` without ``CAP_SYS_ADMIN`` will return

``-EPERM``.

once disabled, calling ``bpf()`` without ``CAP_SYS_ADMIN`` or ``CAP_BPF``

will return ``-EPERM``. Once set to 1, this can't be cleared from the

running kernel anymore.



Once set, this can't be cleared.

Writing 2 to this entry will also disable unprivileged calls to ``bpf()``,

however, an admin can still change this setting later on, if needed, by

writing 0 or 1 to this entry.



If ``BPF_UNPRIV_DEFAULT_OFF`` is enabled in the kernel config, then this

entry will default to 2 instead of 0.



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

0 Unprivileged calls to ``bpf()`` are enabled

1 Unprivileged calls to ``bpf()`` are disabled without recovery

2 Unprivileged calls to ``bpf()`` are disabled

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



watchdog

========

Documentation/devicetree/bindings/i2c/i2c-mpc.yaml

+7 −0
Original line number Diff line number Diff line
@@ -46,6 +46,13 @@ properties: 
    description: |

      I2C bus timeout in microseconds



  fsl,i2c-erratum-a004447:

    $ref: /schemas/types.yaml#/definitions/flag

    description: |

      Indicates the presence of QorIQ erratum A-004447, which

      says that the standard i2c recovery scheme mechanism does

      not work and an alternate implementation is needed.



required:

  - compatible

  - reg

Documentation/devicetree/bindings/net/renesas,ether.yaml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ allOf: 
  - $ref: ethernet-controller.yaml#



maintainers:

  - Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

  - Sergei Shtylyov <sergei.shtylyov@gmail.com>



properties:

  compatible:

Documentation/driver-api/usb/usb.rst

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ are in ``drivers/usb/common/common.c``. 
In addition, some functions useful for creating debugging output are

defined in ``drivers/usb/common/debug.c``.



.. _usb_header:



Host-Side Data Types and Macros

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

Documentation/userspace-api/seccomp_filter.rst

+8 −8
Original line number Diff line number Diff line
@@ -250,14 +250,14 @@ Users can read via ``ioctl(SECCOMP_IOCTL_NOTIF_RECV)`` (or ``poll()``) on a 
seccomp notification fd to receive a ``struct seccomp_notif``, which contains

five members: the input length of the structure, a unique-per-filter ``id``,

the ``pid`` of the task which triggered this request (which may be 0 if the

task is in a pid ns not visible from the listener's pid namespace), a ``flags``

member which for now only has ``SECCOMP_NOTIF_FLAG_SIGNALED``, representing

whether or not the notification is a result of a non-fatal signal, and the

``data`` passed to seccomp. Userspace can then make a decision based on this

information about what to do, and ``ioctl(SECCOMP_IOCTL_NOTIF_SEND)`` a

response, indicating what should be returned to userspace. The ``id`` member of

``struct seccomp_notif_resp`` should be the same ``id`` as in ``struct

seccomp_notif``.

task is in a pid ns not visible from the listener's pid namespace). The

notification also contains the ``data`` passed to seccomp, and a filters flag.

The structure should be zeroed out prior to calling the ioctl.



Userspace can then make a decision based on this information about what to do,

and ``ioctl(SECCOMP_IOCTL_NOTIF_SEND)`` a response, indicating what should be

returned to userspace. The ``id`` member of ``struct seccomp_notif_resp`` should

be the same ``id`` as in ``struct seccomp_notif``.



It is worth noting that ``struct seccomp_data`` contains the values of register

arguments to the syscall, but does not contain pointers to memory. The task's