History

Merge 5.0-rc4 into char-misc-next

We need the char-misc fixes in here as well.

Greg Kroah-Hartman committed 7 years ago

Commit fdddcfd2 parents f9f7bb9 f17b5f01169 files · +11823 −6458Browse files

Showing the changes to include/uapi/linux/android (1 of 1169 files). Show all

Unified · Split

include/uapi/linux/android/binderfs.hrenamed from include/uapi/linux/android/binder_ctl.h+5−5
@@ -4,8 +4,8 @@ · 3 unmodified lines
4 *4 *
5 */5 */
6 6
7#ifndef _UAPI_LINUX_BINDER_CTL_H7#ifndef _UAPI_LINUX_BINDERFS_H
8#define _UAPI_LINUX_BINDER_CTL_H8#define _UAPI_LINUX_BINDERFS_H
9 9
10#include <linux/android/binder.h>10#include <linux/android/binder.h>
11#include <linux/types.h>11#include <linux/types.h>
@@ -22,8 +22,8 @@ · 10 unmodified lines
22 */22 */
23struct binderfs_device {23struct binderfs_device {
24 char name[BINDERFS_MAX_NAME + 1];24 char name[BINDERFS_MAX_NAME + 1];
25 __u8 major;25 __u32 major;
26 __u8 minor;26 __u32 minor;
27};27};
28 28
29/**29/**
@@ -31,5 +31,5 @@ struct binderfs_device { · 1 unmodified line
31 */31 */
32#define BINDER_CTL_ADD _IOWR('b', 1, struct binderfs_device)32#define BINDER_CTL_ADD _IOWR('b', 1, struct binderfs_device)
33 33
34#endif /* _UAPI_LINUX_BINDER_CTL_H */34#endif /* _UAPI_LINUX_BINDERFS_H */
35 35