This resolves a lot of merge issues with PAGE_CACHE_* changes, and an iio driver merge issue.
Showing the changes to include/uapi (4 of 918 files). Show all
Unified · Split
| @@ -375,6 +375,7 @@ struct bpf_tunnel_key { · 374 unmodified lines | |||
| 375 | }; | 375 | }; |
| 376 | __u8 tunnel_tos; | 376 | __u8 tunnel_tos; |
| 377 | __u8 tunnel_ttl; | 377 | __u8 tunnel_ttl; |
| 378 | __u16 tunnel_ext; | ||
| 378 | __u32 tunnel_label; | 379 | __u32 tunnel_label; |
| 379 | }; | 380 | }; |
| 380 | 381 | ||
| @@ -1 +1,5 @@ | |||
| 1 | #include <linux/compiler.h> | 1 | #include <linux/compiler.h> |
| 2 | |||
| 3 | #ifndef __always_inline | ||
| 4 | #define __always_inline inline | ||
| 5 | #endif | ||
| @@ -899,7 +899,7 @@ struct usb_ssp_cap_descriptor { · 898 unmodified lines | |||
| 899 | __le32 bmAttributes; | 899 | __le32 bmAttributes; |
| 900 | #define USB_SSP_SUBLINK_SPEED_ATTRIBS (0x1f << 0) /* sublink speed entries */ | 900 | #define USB_SSP_SUBLINK_SPEED_ATTRIBS (0x1f << 0) /* sublink speed entries */ |
| 901 | #define USB_SSP_SUBLINK_SPEED_IDS (0xf << 5) /* speed ID entries */ | 901 | #define USB_SSP_SUBLINK_SPEED_IDS (0xf << 5) /* speed ID entries */ |
| 902 | __u16 wFunctionalitySupport; | 902 | __le16 wFunctionalitySupport; |
| 903 | #define USB_SSP_MIN_SUBLINK_SPEED_ATTRIBUTE_ID (0xf) | 903 | #define USB_SSP_MIN_SUBLINK_SPEED_ATTRIBUTE_ID (0xf) |
| 904 | #define USB_SSP_MIN_RX_LANE_COUNT (0xf << 8) | 904 | #define USB_SSP_MIN_RX_LANE_COUNT (0xf << 8) |
| 905 | #define USB_SSP_MIN_TX_LANE_COUNT (0xf << 12) | 905 | #define USB_SSP_MIN_TX_LANE_COUNT (0xf << 12) |
| @@ -40,6 +40,8 @@ · 39 unmodified lines | |||
| 40 | #define VIRTIO_CONFIG_S_DRIVER_OK 4 | 40 | #define VIRTIO_CONFIG_S_DRIVER_OK 4 |
| 41 | /* Driver has finished configuring features */ | 41 | /* Driver has finished configuring features */ |
| 42 | #define VIRTIO_CONFIG_S_FEATURES_OK 8 | 42 | #define VIRTIO_CONFIG_S_FEATURES_OK 8 |
| 43 | /* Device entered invalid state, driver must reset it */ | ||
| 44 | #define VIRTIO_CONFIG_S_NEEDS_RESET 0x40 | ||
| 43 | /* We've given up on this device. */ | 45 | /* We've given up on this device. */ |
| 44 | #define VIRTIO_CONFIG_S_FAILED 0x80 | 46 | #define VIRTIO_CONFIG_S_FAILED 0x80 |
| 45 | 47 | ||