Linux 4.11-rc4 The i915 GVT team need the rc4 code to base some more code on.
Showing the changes to include/uapi (3 of 379 files). Show all
Unified · Split
| @@ -730,9 +730,11 @@ __SYSCALL(__NR_pkey_mprotect, sys_pkey_mprotect) · 729 unmodified lines | ||
| 730 | 730 | __SYSCALL(__NR_pkey_alloc, sys_pkey_alloc) |
| 731 | 731 | #define __NR_pkey_free 290 |
| 732 | 732 | __SYSCALL(__NR_pkey_free, sys_pkey_free) |
| 733 | +#define __NR_statx 291 | |
| 734 | +__SYSCALL(__NR_statx, sys_statx) | |
| 733 | 735 | |
| 734 | 736 | #undef __NR_syscalls |
| 735 | −#define __NR_syscalls 291 | |
| 737 | +#define __NR_syscalls 292 | |
| 736 | 738 | |
| 737 | 739 | /* |
| 738 | 740 | * All syscalls below here should go away really, |
| @@ -713,33 +713,6 @@ enum btrfs_err_code { · 712 unmodified lines | ||
| 713 | 713 | BTRFS_ERROR_DEV_ONLY_WRITABLE, |
| 714 | 714 | BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS |
| 715 | 715 | }; |
| 716 | −/* An error code to error string mapping for the kernel | |
| 717 | −* error codes | |
| 718 | −*/ | |
| 719 | −static inline char *btrfs_err_str(enum btrfs_err_code err_code) | |
| 720 | −{ | |
| 721 | − switch (err_code) { | |
| 722 | − case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET: | |
| 723 | − return "unable to go below two devices on raid1"; | |
| 724 | − case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET: | |
| 725 | − return "unable to go below four devices on raid10"; | |
| 726 | − case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET: | |
| 727 | − return "unable to go below two devices on raid5"; | |
| 728 | − case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET: | |
| 729 | − return "unable to go below three devices on raid6"; | |
| 730 | − case BTRFS_ERROR_DEV_TGT_REPLACE: | |
| 731 | − return "unable to remove the dev_replace target dev"; | |
| 732 | − case BTRFS_ERROR_DEV_MISSING_NOT_FOUND: | |
| 733 | − return "no missing devices found to remove"; | |
| 734 | − case BTRFS_ERROR_DEV_ONLY_WRITABLE: | |
| 735 | − return "unable to remove the only writeable device"; | |
| 736 | − case BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS: | |
| 737 | − return "add/delete/balance/replace/resize operation "\ | |
| 738 | − "in progress"; | |
| 739 | − default: | |
| 740 | − return NULL; | |
| 741 | − } | |
| 742 | −} | |
| 743 | 716 | |
| 744 | 717 | #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ |
| 745 | 718 | struct btrfs_ioctl_vol_args) |
| @@ -34,6 +34,7 @@ · 33 unmodified lines | ||
| 34 | 34 | #define MLX5_ABI_USER_H |
| 35 | 35 | |
| 36 | 36 | #include <linux/types.h> |
| 37 | +#include <linux/if_ether.h> /* For ETH_ALEN. */ | |
| 37 | 38 | |
| 38 | 39 | enum { |
| 39 | 40 | MLX5_QP_FLAG_SIGNATURE = 1 << 0, |
| @@ -66,7 +67,7 @@ struct mlx5_ib_alloc_ucontext_req { · 26 unmodified lines | ||
| 66 | 67 | }; |
| 67 | 68 | |
| 68 | 69 | enum mlx5_lib_caps { |
| 69 | − MLX5_LIB_CAP_4K_UAR = (u64)1 << 0, | |
| 70 | + MLX5_LIB_CAP_4K_UAR = (__u64)1 << 0, | |
| 70 | 71 | }; |
| 71 | 72 | |
| 72 | 73 | struct mlx5_ib_alloc_ucontext_req_v2 { |