Commit f0b59897 authored by David S. Miller's avatar David S. Miller
Browse files


Minor comment conflict in mac80211.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1a147b74 7111951b
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ properties:
      - items:
        - const: allwinner,sun7i-a20-crypto
        - const: allwinner,sun4i-a10-crypto
      - items:
        - const: allwinner,sun8i-a33-crypto

  reg:
    maxItems: 1
+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties:
    * "cypress,tm2-touchkey" - for the touchkey found on the tm2 board
    * "cypress,midas-touchkey" - for the touchkey found on midas boards
    * "cypress,aries-touchkey" - for the touchkey found on aries boards
    * "coreriver,tc360-touchkey" - for the Coreriver TouchCore 360 touchkey
- reg: I2C address of the chip.
- interrupts: interrupt to which the chip is connected (see interrupt
	binding[0]).
+2 −0
Original line number Diff line number Diff line
@@ -205,6 +205,8 @@ patternProperties:
    description: Colorful GRP, Shenzhen Xueyushi Technology Ltd.
  "^compulab,.*":
    description: CompuLab Ltd.
  "^coreriver,.*":
    description: CORERIVER Semiconductor Co.,Ltd.
  "^corpro,.*":
    description: Chengdu Corpro Technology Co., Ltd.
  "^cortina,.*":
+25 −0
Original line number Diff line number Diff line
@@ -53,6 +53,29 @@ key management interface to perform common hypervisor activities such as
encrypting bootstrap code, snapshot, migrating and debugging the guest. For more
information, see the SEV Key Management spec [api-spec]_

The main ioctl to access SEV is KVM_MEM_ENCRYPT_OP.  If the argument
to KVM_MEM_ENCRYPT_OP is NULL, the ioctl returns 0 if SEV is enabled
and ``ENOTTY` if it is disabled (on some older versions of Linux,
the ioctl runs normally even with a NULL argument, and therefore will
likely return ``EFAULT``).  If non-NULL, the argument to KVM_MEM_ENCRYPT_OP
must be a struct kvm_sev_cmd::

       struct kvm_sev_cmd {
               __u32 id;
               __u64 data;
               __u32 error;
               __u32 sev_fd;
       };


The ``id`` field contains the subcommand, and the ``data`` field points to
another struct containing arguments specific to command.  The ``sev_fd``
should point to a file descriptor that is opened on the ``/dev/sev``
device, if needed (see individual commands).

On output, ``error`` is zero on success, or an error code.  Error codes
are defined in ``<linux/psp-dev.h>`.

KVM implements the following commands to support common lifecycle events of SEV
guests, such as launching, running, snapshotting, migrating and decommissioning.

@@ -90,6 +113,8 @@ Returns: 0 on success, -negative on error

On success, the 'handle' field contains a new handle and on error, a negative value.

KVM_SEV_LAUNCH_START requires the ``sev_fd`` field to be valid.

For more details, see SEV spec Section 6.2.

3. KVM_SEV_LAUNCH_UPDATE_DATA
+4 −5
Original line number Diff line number Diff line
@@ -7590,7 +7590,8 @@ F: Documentation/admin-guide/perf/hisi-pmu.rst
HISILICON ROCE DRIVER
M:	Lijun Ou <oulijun@huawei.com>
M:	Wei Hu(Xavier) <xavier.huwei@huawei.com>
M:	Wei Hu(Xavier) <huwei87@hisilicon.com>
M:	Weihang Li <liweihang@huawei.com>
L:	linux-rdma@vger.kernel.org
S:	Maintained
F:	drivers/infiniband/hw/hns/
@@ -15448,11 +15449,9 @@ F: drivers/infiniband/sw/siw/
F:	include/uapi/rdma/siw-abi.h
SOFT-ROCE DRIVER (rxe)
M:	Moni Shoua <monis@mellanox.com>
M:	Zhu Yanjun <yanjunz@mellanox.com>
L:	linux-rdma@vger.kernel.org
S:	Supported
W:	https://github.com/SoftRoCE/rxe-dev/wiki/rxe-dev:-Home
Q:	http://patchwork.kernel.org/project/linux-rdma/list/
F:	drivers/infiniband/sw/rxe/
F:	include/uapi/rdma/rdma_user_rxe.h
@@ -16789,7 +16788,7 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/
S:	Maintained
F:	drivers/media/platform/ti-vpe/
F:	Documentation/devicetree/bindings/media/ti,vpe.yaml
	Documentation/devicetree/bindings/media/ti,cal.yaml
F:	Documentation/devicetree/bindings/media/ti,cal.yaml
TI WILINK WIRELESS DRIVERS
L:	linux-wireless@vger.kernel.org
Loading