Cross-merge networking fixes after downstream PR (net-6.18-rc6). No conflicts, adjacent changes in: drivers/net/phy/micrel.c 96a9178a29a6 ("net: phy: micrel: lan8814 fix reset of the QSGMII interface") 61b7ade9ba8c ("net: phy: micrel: Add support for non PTP SKUs for lan8814") and a trivial one in tools/testing/selftests/drivers/net/Makefile.
Showing the changes to tools/include/uapi/linux (1 of 303 files). Show all
Unified · Split
| @@ -962,6 +962,7 @@ struct kvm_enable_cap { · 961 unmodified lines | |||
| 962 | #define KVM_CAP_ARM_EL2_E2H0 241 | 962 | #define KVM_CAP_ARM_EL2_E2H0 241 |
| 963 | #define KVM_CAP_RISCV_MP_STATE_RESET 242 | 963 | #define KVM_CAP_RISCV_MP_STATE_RESET 242 |
| 964 | #define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243 | 964 | #define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243 |
| 965 | #define KVM_CAP_GUEST_MEMFD_FLAGS 244 | ||
| 965 | 966 | ||
| 966 | struct kvm_irq_routing_irqchip { | 967 | struct kvm_irq_routing_irqchip { |
| 967 | __u32 irqchip; | 968 | __u32 irqchip; |
| @@ -1598,6 +1599,8 @@ struct kvm_memory_attributes { · 630 unmodified lines | |||
| 1598 | #define KVM_MEMORY_ATTRIBUTE_PRIVATE (1ULL << 3) | 1599 | #define KVM_MEMORY_ATTRIBUTE_PRIVATE (1ULL << 3) |
| 1599 | 1600 | ||
| 1600 | #define KVM_CREATE_GUEST_MEMFD _IOWR(KVMIO, 0xd4, struct kvm_create_guest_memfd) | 1601 | #define KVM_CREATE_GUEST_MEMFD _IOWR(KVMIO, 0xd4, struct kvm_create_guest_memfd) |
| 1602 | #define GUEST_MEMFD_FLAG_MMAP (1ULL << 0) | ||
| 1603 | #define GUEST_MEMFD_FLAG_INIT_SHARED (1ULL << 1) | ||
| 1601 | 1604 | ||
| 1602 | struct kvm_create_guest_memfd { | 1605 | struct kvm_create_guest_memfd { |
| 1603 | __u64 size; | 1606 | __u64 size; |