Linux 4.11-rc5 * tag 'v4.11-rc5': (1168 commits) Linux 4.11-rc5 tty: pl011: fix earlycon work-around for QDF2400 erratum 44 kasan: do not sanitize kexec purgatory drivers/rapidio/devices/tsi721.c: make module parameter variable name unique mm/hugetlb.c: don't call region_abort if region_chg fails kasan: report only the first error by default hugetlbfs: initialize shared policy as part of inode allocation mm: fix section name for .data..ro_after_init mm, hugetlb: use pte_present() instead of pmd_present() in follow_huge_pmd() mm: workingset: fix premature shadow node shrinking with cgroups mm: rmap: fix huge file mmap accounting in the memcg stats mm: move mm_percpu_wq initialization earlier mm: migrate: fix remove_migration_pte() for ksm pages nfs: flexfiles: fix kernel OOPS if MDS returns unsupported DS type NFSv4.1 fix infinite loop on IO BAD_STATEID error serial: 8250_EXAR: fix duplicate Kconfig text and add missing help text tty/serial: atmel: fix TX path in atmel_console_write() tty/serial: atmel: fix race condition (TX+DMA) serial: mxs-auart: Fix baudrate calculation irqchip/mips-gic: Fix Local compare interrupt ...
Showing the changes to include/uapi/linux (3 of 1235 files). Show all
Unified · Split
| @@ -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) |
| @@ -64,7 +64,7 @@ struct packet_diag_mclist { · 63 unmodified lines | ||
| 64 | 64 | __u32 pdmc_count; |
| 65 | 65 | __u16 pdmc_type; |
| 66 | 66 | __u16 pdmc_alen; |
| 67 | − __u8 pdmc_addr[MAX_ADDR_LEN]; | |
| 67 | + __u8 pdmc_addr[32]; /* MAX_ADDR_LEN */ | |
| 68 | 68 | }; |
| 69 | 69 | |
| 70 | 70 | struct packet_diag_ring { |
| @@ -18,8 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * means the userland is reading). |
| 19 | 19 | */ |
| 20 | 20 | #define UFFD_API ((__u64)0xAA) |
| 21 | −#define UFFD_API_FEATURES (UFFD_FEATURE_EVENT_EXIT | \ | |
| 22 | − UFFD_FEATURE_EVENT_FORK | \ | |
| 21 | +#define UFFD_API_FEATURES (UFFD_FEATURE_EVENT_FORK | \ | |
| 23 | 22 | UFFD_FEATURE_EVENT_REMAP | \ |
| 24 | 23 | UFFD_FEATURE_EVENT_REMOVE | \ |
| 25 | 24 | UFFD_FEATURE_EVENT_UNMAP | \ |
| @@ -113,7 +112,6 @@ struct uffd_msg { · 87 unmodified lines | ||
| 113 | 112 | #define UFFD_EVENT_REMAP 0x14 |
| 114 | 113 | #define UFFD_EVENT_REMOVE 0x15 |
| 115 | 114 | #define UFFD_EVENT_UNMAP 0x16 |
| 116 | −#define UFFD_EVENT_EXIT 0x17 | |
| 117 | 115 | |
| 118 | 116 | /* flags for UFFD_EVENT_PAGEFAULT */ |
| 119 | 117 | #define UFFD_PAGEFAULT_FLAG_WRITE (1<<0) /* If this was a write fault */ |
| @@ -163,7 +161,6 @@ struct uffdio_api { · 43 unmodified lines | ||
| 163 | 161 | #define UFFD_FEATURE_MISSING_HUGETLBFS (1<<4) |
| 164 | 162 | #define UFFD_FEATURE_MISSING_SHMEM (1<<5) |
| 165 | 163 | #define UFFD_FEATURE_EVENT_UNMAP (1<<6) |
| 166 | −#define UFFD_FEATURE_EVENT_EXIT (1<<7) | |
| 167 | 164 | __u64 features; |
| 168 | 165 | |
| 169 | 166 | __u64 ioctls; |