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

Commit d88f1f1f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into locking/core, to pick up fixes and dependencies 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 04860d48 cdb06e9d

.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/eeprom/at24.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,9 +38,9 @@ Required properties: 




                "catalyst",

                "catalyst",

                "microchip",

                "microchip",

                "nxp",

                "ramtron",

                "ramtron",

                "renesas",

                "renesas",

                "nxp",

                "st",

                "st",





                Some vendors use different model names for chips which are just

                Some vendors use different model names for chips which are just