History

Merge 4.7-rc4 into staging-next

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

Greg Kroah-Hartman committed 10 years ago

Commit af527392 parents 25ed6a5 33688ab561 files · +5198 −3321Browse files

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

Unified · Split

2 files
  1. include/uapi/linux/btrfs.h +1 −1
  2. include/uapi/linux/gtp.h +1 −1
include/uapi/linux/btrfs.h+1−1
@@ -118,7 +118,7 @@ struct btrfs_ioctl_vol_args_v2 { · 117 unmodified lines
118 };118 };
119 union {119 union {
120 char name[BTRFS_SUBVOL_NAME_MAX + 1];120 char name[BTRFS_SUBVOL_NAME_MAX + 1];
121 u64 devid;121 __u64 devid;
122 };122 };
123};123};
124 124
include/uapi/linux/gtp.h+1−1
@@ -1,5 +1,5 @@
1#ifndef _UAPI_LINUX_GTP_H_1#ifndef _UAPI_LINUX_GTP_H_
2#define _UAPI_LINUX_GTP_H__2#define _UAPI_LINUX_GTP_H_
3 3
4enum gtp_genl_cmds {4enum gtp_genl_cmds {
5 GTP_CMD_NEWPDP,5 GTP_CMD_NEWPDP,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t