Merge remote-tracking branch 'linus/master' into patchwork
There are some patches that depends on media-v3.16-rc6. So, merge back from upstream before applying them. * linus/master: (1123 commits) drm/nouveau: ltc/gf100-: fix cbc issues on certain boards drm/bochs: add missing drm_connector_register call drm/cirrus: add missing drm_connector_register call staging: vt6655: buffer overflow in ioctl USB: storage: Add quirks for Entrega/Xircom USB to SCSI converters USB: storage: Add quirk for Ariston Technologies iConnect USB to SCSI adapter USB: storage: Add quirk for Adaptec USBConnect 2000 USB-to-SCSI Adapter USB: EHCI: unlink QHs even after the controller has stopped [SCSI] fix for bidi use after free [SCSI] fix regression that accidentally disabled block-based tcq [SCSI] libiscsi: fix potential buffer overrun in __iscsi_conn_send_pdu drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page drm/nouveau/runpm: fix module unload drm/radeon/px: fix module unload vgaswitcheroo: add vga_switcheroo_fini_domain_pm_ops drm/radeon: don't reset dma on r6xx-evergreen init drm/radeon: don't reset sdma on CIK init drm/radeon: don't reset dma on NI/SI init drm/radeon/dpm: fix resume on mullins drm/radeon: Disable HDP flush before every CS again for < r600 ...
This commit is contained in:
commit
3cf0c6bd68
1103 changed files with 11830 additions and 6030 deletions
|
@ -240,6 +240,7 @@ header-y += matroxfb.h
|
|||
header-y += mdio.h
|
||||
header-y += media.h
|
||||
header-y += mei.h
|
||||
header-y += memfd.h
|
||||
header-y += mempolicy.h
|
||||
header-y += meye.h
|
||||
header-y += mic_common.h
|
||||
|
@ -396,6 +397,7 @@ header-y += un.h
|
|||
header-y += unistd.h
|
||||
header-y += unix_diag.h
|
||||
header-y += usbdevice_fs.h
|
||||
header-y += usbip.h
|
||||
header-y += utime.h
|
||||
header-y += utsname.h
|
||||
header-y += uuid.h
|
||||
|
|
|
@ -165,6 +165,7 @@ struct input_keymap_entry {
|
|||
#define INPUT_PROP_BUTTONPAD 0x02 /* has button(s) under pad */
|
||||
#define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */
|
||||
#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */
|
||||
#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */
|
||||
|
||||
#define INPUT_PROP_MAX 0x1f
|
||||
#define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)
|
||||
|
|
26
include/uapi/linux/usbip.h
Normal file
26
include/uapi/linux/usbip.h
Normal file
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* usbip.h
|
||||
*
|
||||
* USBIP uapi defines and function prototypes etc.
|
||||
*/
|
||||
|
||||
#ifndef _UAPI_LINUX_USBIP_H
|
||||
#define _UAPI_LINUX_USBIP_H
|
||||
|
||||
/* usbip device status - exported in usbip device sysfs status */
|
||||
enum usbip_device_status {
|
||||
/* sdev is available. */
|
||||
SDEV_ST_AVAILABLE = 0x01,
|
||||
/* sdev is now used. */
|
||||
SDEV_ST_USED,
|
||||
/* sdev is unusable because of a fatal error. */
|
||||
SDEV_ST_ERROR,
|
||||
|
||||
/* vdev does not connect a remote device. */
|
||||
VDEV_ST_NULL,
|
||||
/* vdev is used, but the USB address is not assigned yet */
|
||||
VDEV_ST_NOTASSIGNED,
|
||||
VDEV_ST_USED,
|
||||
VDEV_ST_ERROR
|
||||
};
|
||||
#endif /* _UAPI_LINUX_USBIP_H */
|
|
@ -13,7 +13,7 @@
|
|||
#ifndef _UAPI_LINUX_XATTR_H
|
||||
#define _UAPI_LINUX_XATTR_H
|
||||
|
||||
#ifdef __UAPI_DEF_XATTR
|
||||
#if __UAPI_DEF_XATTR
|
||||
#define __USE_KERNEL_XATTR_DEFS
|
||||
|
||||
#define XATTR_CREATE 0x1 /* set value, fail if attr already exists */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue