mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 06:41:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge 4.7-rc4 into staging-next

Browse Source 
We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2016-06-20 08:25:44 -07:00
parent 25ed6a5e97 33688abb28
commit af52739b92
561 changed files with 5221 additions and 3344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/linux/btrfs.h
View File

@@ -118,7 +118,7 @@ struct btrfs_ioctl_vol_args_v2 {
};
union {
char name[BTRFS_SUBVOL_NAME_MAX + 1];
u64 devid;
__u64 devid;
};
};

2
include/uapi/linux/gtp.h
View File

@@ -1,5 +1,5 @@
#ifndef _UAPI_LINUX_GTP_H_
#define _UAPI_LINUX_GTP_H__
#define _UAPI_LINUX_GTP_H_
enum gtp_genl_cmds {
GTP_CMD_NEWPDP,

3
include/uapi/sound/Kbuild
View File

@@ -1,5 +1,6 @@
# UAPI Header export list
header-y += asequencer.h
header-y += asoc.h
header-y += asound.h
header-y += asound_fm.h
header-y += compress_offload.h
@@ -10,3 +11,5 @@ header-y += hdsp.h
header-y += hdspm.h
header-y += sb16_csp.h
header-y += sfnt_info.h
header-y += tlv.h
header-y += usb_stream.h