Merge tag 'v4.6-rc3' into drm-next

Backmerge 4.6-rc3 for i915. Linux 4.6-rc3

Dave Airlie committed 10 years ago

Commit 49047962 parents d57d477 bf16200697 files · +7478 −4789Browse files

Showing the changes to include/uapi (2 of 697 files). Show all

Unified · Split

2 files

include/uapi/linux/usb/ch9.h +1 −1
include/uapi/linux/virtio_config.h +2 −0

include/uapi/linux/usb/ch9.h+1−1

@@ -899,7 +899,7 @@ struct usb_ssp_cap_descriptor { · 898 unmodified lines
899	899	__le32 bmAttributes;
900	900	#define USB_SSP_SUBLINK_SPEED_ATTRIBS (0x1f << 0) /* sublink speed entries */
901	901	#define USB_SSP_SUBLINK_SPEED_IDS (0xf << 5) /* speed ID entries */
902		− __u16 wFunctionalitySupport;
	902	+ __le16 wFunctionalitySupport;
903	903	#define USB_SSP_MIN_SUBLINK_SPEED_ATTRIBUTE_ID (0xf)
904	904	#define USB_SSP_MIN_RX_LANE_COUNT (0xf << 8)
905	905	#define USB_SSP_MIN_TX_LANE_COUNT (0xf << 12)

include/uapi/linux/virtio_config.h+2−0

@@ -40,6 +40,8 @@ · 39 unmodified lines
40	40	#define VIRTIO_CONFIG_S_DRIVER_OK 4
41	41	/* Driver has finished configuring features */
42	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	45	/* We've given up on this device. */
44	46	#define VIRTIO_CONFIG_S_FAILED 0x80
45	47