Commit 96917bb3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



include/linux/net.h
  a5ef058d ("net: introduce and use custom sockopt socket flag")
  e993ffe3 ("net: flag sockets supporting msghdr originated zerocopy")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 86d6f77a 337a0a0b

.mailmap

+3 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ Christoph Hellwig <hch@lst.de> 
Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>

Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
@@ -353,7 +354,8 @@ Peter Oruba <peter@oruba.de> 
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>

Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Documentation/admin-guide/acpi/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ the Linux ACPI support. 
   :maxdepth: 1



   initrd_table_override

   dsdt-override

   ssdt-overlays

   cppc_sysfs

   fan_performance_states

Documentation/block/ublk.rst

+36 −0
Original line number Diff line number Diff line
@@ -144,6 +144,42 @@ managing and controlling ublk devices with help of several control commands: 
  For retrieving device info via ``ublksrv_ctrl_dev_info``. It is the server's

  responsibility to save IO target specific info in userspace.



- ``UBLK_CMD_START_USER_RECOVERY``



  This command is valid if ``UBLK_F_USER_RECOVERY`` feature is enabled. This

  command is accepted after the old process has exited, ublk device is quiesced

  and ``/dev/ublkc*`` is released. User should send this command before he starts

  a new process which re-opens ``/dev/ublkc*``. When this command returns, the

  ublk device is ready for the new process.



- ``UBLK_CMD_END_USER_RECOVERY``



  This command is valid if ``UBLK_F_USER_RECOVERY`` feature is enabled. This

  command is accepted after ublk device is quiesced and a new process has

  opened ``/dev/ublkc*`` and get all ublk queues be ready. When this command

  returns, ublk device is unquiesced and new I/O requests are passed to the

  new process.



- user recovery feature description



  Two new features are added for user recovery: ``UBLK_F_USER_RECOVERY`` and

  ``UBLK_F_USER_RECOVERY_REISSUE``.



  With ``UBLK_F_USER_RECOVERY`` set, after one ubq_daemon(ublk server's io

  handler) is dying, ublk does not delete ``/dev/ublkb*`` during the whole

  recovery stage and ublk device ID is kept. It is ublk server's

  responsibility to recover the device context by its own knowledge.

  Requests which have not been issued to userspace are requeued. Requests

  which have been issued to userspace are aborted.



  With ``UBLK_F_USER_RECOVERY_REISSUE`` set, after one ubq_daemon(ublk

  server's io handler) is dying, contrary to ``UBLK_F_USER_RECOVERY``,

  requests which have been issued to userspace are requeued and will be

  re-issued to the new process after handling ``UBLK_CMD_END_USER_RECOVERY``.

  ``UBLK_F_USER_RECOVERY_REISSUE`` is designed for backends who tolerate

  double-write since the driver may issue the same I/O request twice. It

  might be useful to a read-only FS or a VM backend.



Data plane

----------

Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
Dongwoon Anatech DW9714 camera voice coil lens driver



DW9174 is a 10-bit DAC with current sink capability. It is intended

for driving voice coil lenses in camera modules.



Mandatory properties:



- compatible: "dongwoon,dw9714"

- reg: I²C slave address

Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.yaml

0 → 100644
+47 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/media/i2c/dongwoon,dw9714.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Dongwoon Anatech DW9714 camera voice coil lens driver



maintainers:

  - Krzysztof Kozlowski <krzk@kernel.org>



description:

  DW9174 is a 10-bit DAC with current sink capability. It is intended for

  driving voice coil lenses in camera modules.



properties:

  compatible:

    const: dongwoon,dw9714



  reg:

    maxItems: 1



  powerdown-gpios:

    description:

      XSD pin for shutdown (active low)



  vcc-supply:

    description: VDD power supply



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        camera-lens@c {

            compatible = "dongwoon,dw9714";

            reg = <0x0c>;

            vcc-supply = <&reg_csi_1v8>;

        };

    };