A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 22:23:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-linus' into for-next

Browse source
This commit is contained in:
Takashi Iwai 2016-05-10 16:06:04 +02:00
commit 2e00fde5c6
1042 changed files with 10821 additions and 6782 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/uapi/asm-generic/unistd.h
View file

@ -717,9 +717,13 @@ __SYSCALL(__NR_membarrier, sys_membarrier)
__SYSCALL(__NR_mlock2, sys_mlock2)
#define __NR_copy_file_range 285
__SYSCALL(__NR_copy_file_range, sys_copy_file_range)
#define __NR_preadv2 286
__SYSCALL(__NR_preadv2, sys_preadv2)
#define __NR_pwritev2 287
__SYSCALL(__NR_pwritev2, sys_pwritev2)
#undef __NR_syscalls
#define __NR_syscalls 286
#define __NR_syscalls 288
/*
* All syscalls below here should go away really,

1
include/uapi/linux/Kbuild
View file

@ -96,6 +96,7 @@ header-y += cyclades.h
header-y += cycx_cfm.h
header-y += dcbnl.h
header-y += dccp.h
header-y += devlink.h
header-y += dlmconstants.h
header-y += dlm_device.h
header-y += dlm.h

2
include/uapi/linux/usb/ch9.h
View file

@ -899,7 +899,7 @@ struct usb_ssp_cap_descriptor {
__le32 bmAttributes;
#define USB_SSP_SUBLINK_SPEED_ATTRIBS (0x1f << 0) /* sublink speed entries */
#define USB_SSP_SUBLINK_SPEED_IDS (0xf << 5) /* speed ID entries */
__u16 wFunctionalitySupport;
__le16 wFunctionalitySupport;
#define USB_SSP_MIN_SUBLINK_SPEED_ATTRIBUTE_ID (0xf)
#define USB_SSP_MIN_RX_LANE_COUNT (0xf << 8)
#define USB_SSP_MIN_TX_LANE_COUNT (0xf << 12)

2
include/uapi/linux/virtio_config.h
View file

@ -40,6 +40,8 @@
#define VIRTIO_CONFIG_S_DRIVER_OK 4
/* Driver has finished configuring features */
#define VIRTIO_CONFIG_S_FEATURES_OK 8
/* Device entered invalid state, driver must reset it */
#define VIRTIO_CONFIG_S_NEEDS_RESET 0x40
/* We've given up on this device. */
#define VIRTIO_CONFIG_S_FAILED 0x80