History

Merge tag 'asoc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

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

Takashi Iwai committed 9 years ago

Commit a5c3b322 parents d7dc450 20d5c841233 files · +26137 −8842Browse files

Showing the changes to include/uapi (7 of 1233 files). Show all

Unified · Split

7 files
  1. include/uapi/asm-generic/unistd.h +3 −1
  2. include/uapi/linux/Kbuild +1 −0
  3. include/uapi/linux/btrfs.h +0 −27
  4. include/uapi/linux/ipv6_route.h +1 −1
  5. include/uapi/linux/stat.h +3 −2
  6. include/uapi/linux/virtio_pci.h +1 −1
  7. include/uapi/rdma/mlx5-abi.h +2 −1
include/uapi/asm-generic/unistd.h+3−1
@@ -730,9 +730,11 @@ __SYSCALL(__NR_pkey_mprotect, sys_pkey_mprotect) · 729 unmodified lines
730__SYSCALL(__NR_pkey_alloc, sys_pkey_alloc)730__SYSCALL(__NR_pkey_alloc, sys_pkey_alloc)
731#define __NR_pkey_free 290731#define __NR_pkey_free 290
732__SYSCALL(__NR_pkey_free, sys_pkey_free)732__SYSCALL(__NR_pkey_free, sys_pkey_free)
733#define __NR_statx 291
734__SYSCALL(__NR_statx, sys_statx)
733 735
734#undef __NR_syscalls736#undef __NR_syscalls
735#define __NR_syscalls 291737#define __NR_syscalls 292
736 738
737/*739/*
738 * All syscalls below here should go away really,740 * All syscalls below here should go away really,
include/uapi/linux/Kbuild+1−0
@@ -445,6 +445,7 @@ header-y += unistd.h · 444 unmodified lines
445header-y += unix_diag.h445header-y += unix_diag.h
446header-y += usbdevice_fs.h446header-y += usbdevice_fs.h
447header-y += usbip.h447header-y += usbip.h
448header-y += userio.h
448header-y += utime.h449header-y += utime.h
449header-y += utsname.h450header-y += utsname.h
450header-y += uuid.h451header-y += uuid.h
include/uapi/linux/btrfs.h+0−27
@@ -713,33 +713,6 @@ enum btrfs_err_code { · 712 unmodified lines
713 BTRFS_ERROR_DEV_ONLY_WRITABLE,713 BTRFS_ERROR_DEV_ONLY_WRITABLE,
714 BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS714 BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS
715};715};
716/* An error code to error string mapping for the kernel
717* error codes
718*/
719static 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#define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \717#define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \
745 struct btrfs_ioctl_vol_args)718 struct btrfs_ioctl_vol_args)
include/uapi/linux/ipv6_route.h+1−1
@@ -35,7 +35,7 @@ · 34 unmodified lines
35#define RTF_PREF(pref) ((pref) << 27)35#define RTF_PREF(pref) ((pref) << 27)
36#define RTF_PREF_MASK 0x1800000036#define RTF_PREF_MASK 0x18000000
37 37
38#define RTF_PCPU 0x4000000038#define RTF_PCPU 0x40000000 /* read-only: can not be set by user */
39#define RTF_LOCAL 0x8000000039#define RTF_LOCAL 0x80000000
40 40
41 41
include/uapi/linux/stat.h+3−2
@@ -114,7 +114,7 @@ struct statx { · 113 unmodified lines
114 __u64 stx_ino; /* Inode number */114 __u64 stx_ino; /* Inode number */
115 __u64 stx_size; /* File size */115 __u64 stx_size; /* File size */
116 __u64 stx_blocks; /* Number of 512-byte blocks allocated */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 /* 0x40 */118 /* 0x40 */
119 struct statx_timestamp stx_atime; /* Last access time */119 struct statx_timestamp stx_atime; /* Last access time */
120 struct statx_timestamp stx_btime; /* File creation time */120 struct statx_timestamp stx_btime; /* File creation time */
@@ -152,9 +152,10 @@ struct statx { · 31 unmodified lines
152#define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */152#define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */
153#define STATX_BTIME 0x00000800U /* Want/got stx_btime */153#define STATX_BTIME 0x00000800U /* Want/got stx_btime */
154#define STATX_ALL 0x00000fffU /* All currently supported flags */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_attributes158 * Attributes to be found in stx_attributes and masked in stx_attributes_mask.
158 *159 *
159 * These give information about the features or the state of a file that might160 * These give information about the features or the state of a file that might
160 * be of use to ordinary userspace programs such as GUIs or ls rather than161 * be of use to ordinary userspace programs such as GUIs or ls rather than
include/uapi/linux/virtio_pci.h+1−1
@@ -79,7 +79,7 @@ · 78 unmodified lines
79 * configuration space */79 * configuration space */
80#define VIRTIO_PCI_CONFIG_OFF(msix_enabled) ((msix_enabled) ? 24 : 20)80#define VIRTIO_PCI_CONFIG_OFF(msix_enabled) ((msix_enabled) ? 24 : 20)
81/* Deprecated: please use VIRTIO_PCI_CONFIG_OFF instead */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/* Virtio ABI version, this must match exactly */84/* Virtio ABI version, this must match exactly */
85#define VIRTIO_PCI_ABI_VERSION 085#define VIRTIO_PCI_ABI_VERSION 0
include/uapi/rdma/mlx5-abi.h+2−1
@@ -34,6 +34,7 @@ · 33 unmodified lines
34#define MLX5_ABI_USER_H34#define MLX5_ABI_USER_H
35 35
36#include <linux/types.h>36#include <linux/types.h>
37#include <linux/if_ether.h> /* For ETH_ALEN. */
37 38
38enum {39enum {
39 MLX5_QP_FLAG_SIGNATURE = 1 << 0,40 MLX5_QP_FLAG_SIGNATURE = 1 << 0,
@@ -66,7 +67,7 @@ struct mlx5_ib_alloc_ucontext_req { · 26 unmodified lines
66};67};
67 68
68enum mlx5_lib_caps {69enum 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
72struct mlx5_ib_alloc_ucontext_req_v2 {73struct mlx5_ib_alloc_ucontext_req_v2 {

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