Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5893ed18 authored by James Morris's avatar James Morris
Browse files

Merge tag 'v4.16-rc6' into next-general 

Merge to Linux 4.16-rc6 at the request of Jarkko, for his TPM updates.
parents 7bd698b3 c698ca52

.gitignore

+4 −0
Original line number Original line Diff line number Diff line
@@ -127,3 +127,7 @@ all.config 




# Kdevelop4

# Kdevelop4

*.kdev4

*.kdev4



#Automatically generated by ASN.1 compiler

net/ipv4/netfilter/nf_nat_snmp_basic-asn1.c

net/ipv4/netfilter/nf_nat_snmp_basic-asn1.h

Documentation/PCI/pci.txt

+3 −1
Original line number Original line Diff line number Diff line
@@ -570,7 +570,9 @@ your driver if they're helpful, or just use plain hex constants. 
The device IDs are arbitrary hex numbers (vendor controlled) and normally used

The device IDs are arbitrary hex numbers (vendor controlled) and normally used

only in a single location, the pci_device_id table.

only in a single location, the pci_device_id table.





Please DO submit new vendor/device IDs to http://pciids.sourceforge.net/.

Please DO submit new vendor/device IDs to http://pci-ids.ucw.cz/.

There are mirrors of the pci.ids file at http://pciids.sourceforge.net/

and https://github.com/pciutils/pciids.

Documentation/accelerators/ocxl.rst

+5 −0
Original line number Original line Diff line number Diff line
@@ -152,6 +152,11 @@ OCXL_IOCTL_IRQ_SET_FD: 
  Associate an event fd to an AFU interrupt so that the user process

  Associate an event fd to an AFU interrupt so that the user process

  can be notified when the AFU sends an interrupt.

  can be notified when the AFU sends an interrupt.





OCXL_IOCTL_GET_METADATA:



  Obtains configuration information from the card, such at the size of

  MMIO areas, the AFU version, and the PASID for the current context.







mmap

mmap

----

----

Documentation/devicetree/bindings/dma/mv-xor-v2.txt

+5 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,11 @@ Required properties: 
  interrupts.

  interrupts.





Optional properties:

Optional properties:

- clocks: Optional reference to the clock used by the XOR engine.

- clocks: Optional reference to the clocks used by the XOR engine.

- clock-names: mandatory if there is a second clock, in this case the

   name must be "core" for the first clock and "reg" for the second

   one







Example:

Example: