History

Merge tag 'docs-5.8' of git://git.lwn.net/linux

Pull documentation updates from Jonathan Corbet: "A fair amount of stuff this time around, dominated by yet another massive set from Mauro toward the completion of the RST conversion. I *really* hope we are getting close to the end of this. Meanwhile, those patches reach pretty far afield to update document references around the tree; there should be no actual code changes there. There will be, alas, more of the usual trivial merge conflicts. Beyond that we have more translations, improvements to the sphinx scripting, a number of additions to the sysctl documentation, and lots of fixes" * tag 'docs-5.8' of git://git.lwn.net/linux: (130 commits) Documentation: fixes to the maintainer-entry-profile template zswap: docs/vm: Fix typo accept_threshold_percent in zswap.rst tracing: Fix events.rst section numbering docs: acpi: fix old http link and improve document format docs: filesystems: add info about efivars content Documentation: LSM: Correct the basic LSM description mailmap: change email for Ricardo Ribalda docs: sysctl/kernel: document unaligned controls Documentation: admin-guide: update bug-hunting.rst docs: sysctl/kernel: document ngroups_max nvdimm: fixes to maintainter-entry-profile Documentation/features: Correct RISC-V kprobes support entry Documentation/features: Refresh the arch support status files Revert "docs: sysctl/kernel: document ngroups_max" docs: move locking-specific documents to locking/ docs: move digsig docs to the security book docs: move the kref doc into the core-api book docs: add IRQ documentation at the core-api book docs: debugging-via-ohci1394.txt: add it to the core-api book docs: fix references for ipmi.rst file ...

Linus Torvalds committed 6 years ago

Commit b23c4772 parents c2b0fc8 e35b5a4267 files · +6317 −4354Browse files

Showing the changes to include/uapi/linux (3 of 267 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/ethtool_netlink.h +1 −1
  2. include/uapi/linux/firewire-cdev.h +1 −1
  3. include/uapi/linux/kvm.h +2 −2
include/uapi/linux/ethtool_netlink.h+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
2/*2/*
3 * include/uapi/linux/ethtool_netlink.h - netlink interface for ethtool3 * include/uapi/linux/ethtool_netlink.h - netlink interface for ethtool
4 *4 *
5 * See Documentation/networking/ethtool-netlink.txt in kernel source tree for5 * See Documentation/networking/ethtool-netlink.rst in kernel source tree for
6 * doucumentation of the interface.6 * doucumentation of the interface.
7 */7 */
8 8
include/uapi/linux/firewire-cdev.h+1−1
@@ -308,7 +308,7 @@ struct fw_cdev_event_iso_interrupt_mc { · 307 unmodified lines
308/**308/**
309 * struct fw_cdev_event_iso_resource - Iso resources were allocated or freed309 * struct fw_cdev_event_iso_resource - Iso resources were allocated or freed
310 * @closure: See &fw_cdev_event_common;310 * @closure: See &fw_cdev_event_common;
311 * set by %FW_CDEV_IOC_(DE)ALLOCATE_ISO_RESOURCE(_ONCE) ioctl311 * set by``FW_CDEV_IOC_(DE)ALLOCATE_ISO_RESOURCE(_ONCE)`` ioctl
312 * @type: %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED or312 * @type: %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED or
313 * %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED313 * %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED
314 * @handle: Reference by which an allocated resource can be deallocated314 * @handle: Reference by which an allocated resource can be deallocated
include/uapi/linux/kvm.h+2−2
@@ -116,7 +116,7 @@ struct kvm_irq_level { · 115 unmodified lines
116 * ACPI gsi notion of irq.116 * ACPI gsi notion of irq.
117 * For IA-64 (APIC model) IOAPIC0: irq 0-23; IOAPIC1: irq 24-47..117 * For IA-64 (APIC model) IOAPIC0: irq 0-23; IOAPIC1: irq 24-47..
118 * For X86 (standard AT mode) PIC0/1: irq 0-15. IOAPIC0: 0-23..118 * For X86 (standard AT mode) PIC0/1: irq 0-15. IOAPIC0: 0-23..
119 * For ARM: See Documentation/virt/kvm/api.txt119 * For ARM: See Documentation/virt/kvm/api.rst
120 */120 */
121 union {121 union {
122 __u32 irq;122 __u32 irq;
@@ -1107,7 +1107,7 @@ struct kvm_xen_hvm_config { · 984 unmodified lines
1107 *1107 *
1108 * KVM_IRQFD_FLAG_RESAMPLE indicates resamplefd is valid and specifies1108 * KVM_IRQFD_FLAG_RESAMPLE indicates resamplefd is valid and specifies
1109 * the irqfd to operate in resampling mode for level triggered interrupt1109 * the irqfd to operate in resampling mode for level triggered interrupt
1110 * emulation. See Documentation/virt/kvm/api.txt.1110 * emulation. See Documentation/virt/kvm/api.rst.
1111 */1111 */
1112#define KVM_IRQFD_FLAG_RESAMPLE (1 << 1)1112#define KVM_IRQFD_FLAG_RESAMPLE (1 << 1)
1113 1113