Conflicts: drivers/net/can/dev.c commit 03f16c5075b2 ("can: dev: can_restart: fix use after free bug") commit 3e77f70e7345 ("can: dev: move driver related infrastructure into separate subdir") Code move. drivers/net/dsa/b53/b53_common.c commit 8e4052c32d6b ("net: dsa: b53: fix an off by one in checking "vlan->vid"") commit b7a9e0da2d1c ("net: switchdev: remove vid_begin -> vid_end range from VLAN objects") Field rename.
Showing the changes to tools/include/uapi (1 of 285 files). Show all
Unified · Split
| @@ -251,6 +251,7 @@ struct kvm_hyperv_exit { · 250 unmodified lines | |||
| 251 | #define KVM_EXIT_X86_RDMSR 29 | 251 | #define KVM_EXIT_X86_RDMSR 29 |
| 252 | #define KVM_EXIT_X86_WRMSR 30 | 252 | #define KVM_EXIT_X86_WRMSR 30 |
| 253 | #define KVM_EXIT_DIRTY_RING_FULL 31 | 253 | #define KVM_EXIT_DIRTY_RING_FULL 31 |
| 254 | #define KVM_EXIT_AP_RESET_HOLD 32 | ||
| 254 | 255 | ||
| 255 | /* For KVM_EXIT_INTERNAL_ERROR */ | 256 | /* For KVM_EXIT_INTERNAL_ERROR */ |
| 256 | /* Emulate instruction failed. */ | 257 | /* Emulate instruction failed. */ |
| @@ -573,6 +574,7 @@ struct kvm_vapic_addr { · 316 unmodified lines | |||
| 573 | #define KVM_MP_STATE_CHECK_STOP 6 | 574 | #define KVM_MP_STATE_CHECK_STOP 6 |
| 574 | #define KVM_MP_STATE_OPERATING 7 | 575 | #define KVM_MP_STATE_OPERATING 7 |
| 575 | #define KVM_MP_STATE_LOAD 8 | 576 | #define KVM_MP_STATE_LOAD 8 |
| 577 | #define KVM_MP_STATE_AP_RESET_HOLD 9 | ||
| 576 | 578 | ||
| 577 | struct kvm_mp_state { | 579 | struct kvm_mp_state { |
| 578 | __u32 mp_state; | 580 | __u32 mp_state; |