History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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.

Jakub Kicinski committed 1 year ago

Commit c99ebb62 parents f694d21 d0309c0303 files · +3192 −1414Browse files

Showing the changes to tools/include/uapi/linux (1 of 303 files). Show all

Unified · Split

tools/include/uapi/linux/kvm.h+3−0
@@ -962,6 +962,7 @@ struct kvm_enable_cap { · 961 unmodified lines
962#define KVM_CAP_ARM_EL2_E2H0 241962#define KVM_CAP_ARM_EL2_E2H0 241
963#define KVM_CAP_RISCV_MP_STATE_RESET 242963#define KVM_CAP_RISCV_MP_STATE_RESET 242
964#define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243964#define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243
965#define KVM_CAP_GUEST_MEMFD_FLAGS 244
965 966
966struct kvm_irq_routing_irqchip {967struct 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
1602struct kvm_create_guest_memfd {1605struct kvm_create_guest_memfd {
1603 __u64 size;1606 __u64 size;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t