ASoC: Updates for v4.12 A quiet release for the core, but lots of new drivers this time around: - A new, generalized, API for hooking up jacks which makes it easier to write generic machine drivers for simple cases. - Continuing fixes for issues with the x86 CPU drivers. - New drivers for Cirrus CS35L35, DIO DIO2125, Everest ES7132, HiSilicon hi6210, Maxim MAX98927, MT2701 systems with WM8960, Nuvoton NAU8824, Odroid systems, ST STM32 SAI controllers and x86 systems with DA7213
Showing the changes to include/uapi (7 of 1233 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, |
| @@ -445,6 +445,7 @@ header-y += unistd.h · 444 unmodified lines | ||
| 445 | 445 | header-y += unix_diag.h |
| 446 | 446 | header-y += usbdevice_fs.h |
| 447 | 447 | header-y += usbip.h |
| 448 | +header-y += userio.h | |
| 448 | 449 | header-y += utime.h |
| 449 | 450 | header-y += utsname.h |
| 450 | 451 | header-y += uuid.h |
| @@ -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) |
| @@ -35,7 +35,7 @@ · 34 unmodified lines | ||
| 35 | 35 | #define RTF_PREF(pref) ((pref) << 27) |
| 36 | 36 | #define RTF_PREF_MASK 0x18000000 |
| 37 | 37 | |
| 38 | −#define RTF_PCPU 0x40000000 | |
| 38 | +#define RTF_PCPU 0x40000000 /* read-only: can not be set by user */ | |
| 39 | 39 | #define RTF_LOCAL 0x80000000 |
| 40 | 40 | |
| 41 | 41 | |
| @@ -114,7 +114,7 @@ struct statx { · 113 unmodified lines | ||
| 114 | 114 | __u64 stx_ino; /* Inode number */ |
| 115 | 115 | __u64 stx_size; /* File size */ |
| 116 | 116 | __u64 stx_blocks; /* Number of 512-byte blocks allocated */ |
| 117 | − __u64 __spare1[1]; | |
| 117 | + __u64 stx_attributes_mask; /* Mask to show what's supported in stx_attributes */ | |
| 118 | 118 | /* 0x40 */ |
| 119 | 119 | struct statx_timestamp stx_atime; /* Last access time */ |
| 120 | 120 | struct statx_timestamp stx_btime; /* File creation time */ |
| @@ -152,9 +152,10 @@ struct statx { · 31 unmodified lines | ||
| 152 | 152 | #define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */ |
| 153 | 153 | #define STATX_BTIME 0x00000800U /* Want/got stx_btime */ |
| 154 | 154 | #define STATX_ALL 0x00000fffU /* All currently supported flags */ |
| 155 | +#define STATX__RESERVED 0x80000000U /* Reserved for future struct statx expansion */ | |
| 155 | 156 | |
| 156 | 157 | /* |
| 157 | − * Attributes to be found in stx_attributes | |
| 158 | + * Attributes to be found in stx_attributes and masked in stx_attributes_mask. | |
| 158 | 159 | * |
| 159 | 160 | * These give information about the features or the state of a file that might |
| 160 | 161 | * be of use to ordinary userspace programs such as GUIs or ls rather than |
| @@ -79,7 +79,7 @@ · 78 unmodified lines | ||
| 79 | 79 | * configuration space */ |
| 80 | 80 | #define VIRTIO_PCI_CONFIG_OFF(msix_enabled) ((msix_enabled) ? 24 : 20) |
| 81 | 81 | /* Deprecated: please use VIRTIO_PCI_CONFIG_OFF instead */ |
| 82 | −#define VIRTIO_PCI_CONFIG(dev) VIRTIO_PCI_CONFIG_OFF((dev)->pci_dev->msix_enabled) | |
| 82 | +#define VIRTIO_PCI_CONFIG(dev) VIRTIO_PCI_CONFIG_OFF((dev)->msix_enabled) | |
| 83 | 83 | |
| 84 | 84 | /* Virtio ABI version, this must match exactly */ |
| 85 | 85 | #define VIRTIO_PCI_ABI_VERSION 0 |
| @@ -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 { |