diff options
| author | Ingo Molnar <mingo@kernel.org> | 2026-03-06 08:21:02 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-03-06 08:21:02 +0300 |
| commit | 12f8069115d5ff9d292c6b00c74e1984b01b6fc1 (patch) | |
| tree | bb7232b5d5d5775653c1ecef0dcc2d7ca138f4f8 /include/uapi/linux | |
| parent | 2e7af192697ef2a71c76fd57860b0fcd02754e14 (diff) | |
| parent | 5ee8dbf54602dc340d6235b1d6aa17c0f283f48c (diff) | |
| download | linux-12f8069115d5ff9d292c6b00c74e1984b01b6fc1.tar.xz | |
Merge branch 'linus' into sched/core, to resolve conflicts
Conflicts:
kernel/sched/ext.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/pci_regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index ec1c54b5a310..14f634ab9350 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h @@ -712,7 +712,7 @@ #define PCI_EXP_LNKCTL2_HASD 0x0020 /* HW Autonomous Speed Disable */ #define PCI_EXP_LNKSTA2 0x32 /* Link Status 2 */ #define PCI_EXP_LNKSTA2_FLIT 0x0400 /* Flit Mode Status */ -#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 0x32 /* end of v2 EPs w/ link */ +#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 0x34 /* end of v2 EPs w/ link */ #define PCI_EXP_SLTCAP2 0x34 /* Slot Capabilities 2 */ #define PCI_EXP_SLTCAP2_IBPD 0x00000001 /* In-band PD Disable Supported */ #define PCI_EXP_SLTCTL2 0x38 /* Slot Control 2 */ |