History

Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux'

This backmerges Linus' merge commit of the latest drm-fixes pull: commit 549f3a1218ba18fcde11ef0e22b07e6365645788 Merge: 42577ca 058ca4a Author: Linus Torvalds <torvalds@linux-foundation.org> Date: Tue Jul 23 15:47:08 2013 -0700 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux We've accrued a few too many conflicts, but the real reason is that I want to merge the 100% solution for Haswell concurrent registers writes into drm-intel-next. But that depends upon the 90% bandaid merged into -fixes: commit a7cd1b8fea2f341b626b255d9898a5ca5fabbf0a Author: Chris Wilson <chris@chris-wilson.co.uk> Date: Fri Jul 19 20:36:51 2013 +0100 drm/i915: Serialize almost all register access Also, we can roll up on accrued conflicts. Usually I'd backmerge a tagged -rc, but I want to get this done before heading off to vacations next week ;-) Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_gem.c v2: For added hilarity we have a init sequence conflict around the gt_lock, so need to move that one, too. Spotted by Jani Nikula.

Daniel Vetter committed 13 years ago

Commit cb54b532 parents d861e33 549f3a19108 files · +660638 −274921Browse files

Showing the changes to include/uapi (41 of 9108 files). Show all

Unified · Split

41 files
  1. include/uapi/asm-generic/fcntl.h +8 −0
  2. include/uapi/asm-generic/poll.h +2 −0
  3. include/uapi/asm-generic/socket.h +2 −0
  4. include/uapi/asm-generic/unistd.h +1 −1
  5. include/uapi/linux/Kbuild +2 −0
  6. include/uapi/linux/bcm933xx_hcs.h +24 −0
  7. include/uapi/linux/btrfs.h +41 −1
  8. include/uapi/linux/const.h +3 −0
  9. include/uapi/linux/dm-ioctl.h +2 −2
  10. include/uapi/linux/ethtool.h +2 −2
  11. include/uapi/linux/gen_stats.h +11 −0
  12. include/uapi/linux/if_arp.h +1 −0
  13. include/uapi/linux/if_link.h +15 −0
  14. include/uapi/linux/if_pppox.h +2 −2
  15. include/uapi/linux/if_tun.h +2 −0
  16. include/uapi/linux/input.h +13 −4
  17. include/uapi/linux/ip_vs.h +6 −0
  18. include/uapi/linux/kvm.h +2 −0
  19. include/uapi/linux/msdos_fs.h +10 −0
  20. include/uapi/linux/netfilter/nfnetlink_queue.h +2 −0
  21. include/uapi/linux/netfilter/xt_socket.h +7 −0
  22. include/uapi/linux/nfc.h +17 −1
  23. include/uapi/linux/nl80211.h +37 −0
  24. include/uapi/linux/openvswitch.h +19 −1
  25. include/uapi/linux/pci_regs.h +1 −1
  26. include/uapi/linux/perf_event.h +4 −1
  27. include/uapi/linux/ptrace.h +3 −0
  28. include/uapi/linux/rtnetlink.h +2 −0
  29. include/uapi/linux/serial_core.h +6 −0
  30. include/uapi/linux/snmp.h +2 −0
  31. include/uapi/linux/tipc.h +1 −1
  32. include/uapi/linux/tipc_config.h +1 −1
  33. include/uapi/linux/v4l2-controls.h +2 −2
  34. include/uapi/linux/vfio.h +40 −2
  35. include/uapi/linux/videodev2.h +8 −19
  36. include/uapi/linux/virtio_config.h +3 −0
  37. include/uapi/linux/virtio_console.h +3 −0
  38. include/uapi/linux/virtio_pci.h +3 −1
  39. include/uapi/mtd/ubi-user.h +4 −1
  40. include/uapi/rdma/rdma_user_cm.h +63 −10
  41. include/uapi/sound/asound.h +2 −0
include/uapi/asm-generic/fcntl.h+8−0
@@ -84,6 +84,14 @@ · 83 unmodified lines
8484 #define O_PATH 010000000
8585 #endif
8686
87+#ifndef __O_TMPFILE
88+#define __O_TMPFILE 020000000
89+#endif
90+
91+/* a horrid kludge trying to make sure that this will fail on old kernels */
92+#define O_TMPFILE (__O_TMPFILE | O_DIRECTORY)
93+#define O_TMPFILE_MASK (__O_TMPFILE | O_DIRECTORY | O_CREAT)
94+
8795 #ifndef O_NDELAY
8896 #define O_NDELAY O_NONBLOCK
8997 #endif
include/uapi/asm-generic/poll.h+2−0
@@ -30,6 +30,8 @@ · 29 unmodified lines
3030
3131 #define POLLFREE 0x4000 /* currently only for epoll */
3232
33+#define POLL_BUSY_LOOP 0x8000
34+
3335 struct pollfd {
3436 int fd;
3537 short events;
include/uapi/asm-generic/socket.h+2−0
@@ -76,4 +76,6 @@ · 75 unmodified lines
7676
7777 #define SO_SELECT_ERR_QUEUE 45
7878
79+#define SO_BUSY_POLL 46
80+
7981 #endif /* __ASM_GENERIC_SOCKET_H */
include/uapi/asm-generic/unistd.h+1−1
@@ -361,7 +361,7 @@ __SYSCALL(__NR_syslog, sys_syslog) · 360 unmodified lines
361361 #define __NR_ptrace 117
362362 __SYSCALL(__NR_ptrace, sys_ptrace)
363363
364−/* kernel/sched.c */
364+/* kernel/sched/core.c */
365365 #define __NR_sched_setparam 118
366366 __SYSCALL(__NR_sched_setparam, sys_sched_setparam)
367367 #define __NR_sched_setscheduler 119
include/uapi/linux/Kbuild+2−0
@@ -62,6 +62,7 @@ header-y += auxvec.h · 61 unmodified lines
6262 header-y += ax25.h
6363 header-y += b1lli.h
6464 header-y += baycom.h
65+header-y += bcm933xx_hcs.h
6566 header-y += bfs_fs.h
6667 header-y += binfmts.h
6768 header-y += blkpg.h
@@ -261,6 +262,7 @@ header-y += net_dropmon.h · 193 unmodified lines
261262 header-y += net_tstamp.h
262263 header-y += netconf.h
263264 header-y += netdevice.h
265+header-y += netlink_diag.h
264266 header-y += netfilter.h
265267 header-y += netfilter_arp.h
266268 header-y += netfilter_bridge.h
include/uapi/linux/bcm933xx_hcs.h+24−0
@@ -0,0 +1,24 @@
1+/*
2+ * Broadcom Cable Modem firmware format
3+ */
4+
5+#ifndef __BCM933XX_HCS_H
6+#define __BCM933XX_HCS_H
7+
8+#include <linux/types.h>
9+
10+struct bcm_hcs {
11+ __u16 magic;
12+ __u16 control;
13+ __u16 rev_maj;
14+ __u16 rev_min;
15+ __u32 build_date;
16+ __u32 filelen;
17+ __u32 ldaddress;
18+ char filename[64];
19+ __u16 hcs;
20+ __u16 her_znaet_chto;
21+ __u32 crc;
22+};
23+
24+#endif /* __BCM933XX_HCS */
include/uapi/linux/btrfs.h+41−1
@@ -447,6 +447,46 @@ struct btrfs_ioctl_send_args { · 446 unmodified lines
447447 __u64 reserved[4]; /* in */
448448 };
449449
450+/* Error codes as returned by the kernel */
451+enum btrfs_err_code {
452+ notused,
453+ BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET,
454+ BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET,
455+ BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET,
456+ BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET,
457+ BTRFS_ERROR_DEV_TGT_REPLACE,
458+ BTRFS_ERROR_DEV_MISSING_NOT_FOUND,
459+ BTRFS_ERROR_DEV_ONLY_WRITABLE,
460+ BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS
461+};
462+/* An error code to error string mapping for the kernel
463+* error codes
464+*/
465+static inline char *btrfs_err_str(enum btrfs_err_code err_code)
466+{
467+ switch (err_code) {
468+ case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET:
469+ return "unable to go below two devices on raid1";
470+ case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET:
471+ return "unable to go below four devices on raid10";
472+ case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET:
473+ return "unable to go below two devices on raid5";
474+ case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET:
475+ return "unable to go below three devices on raid6";
476+ case BTRFS_ERROR_DEV_TGT_REPLACE:
477+ return "unable to remove the dev_replace target dev";
478+ case BTRFS_ERROR_DEV_MISSING_NOT_FOUND:
479+ return "no missing devices found to remove";
480+ case BTRFS_ERROR_DEV_ONLY_WRITABLE:
481+ return "unable to remove the only writeable device";
482+ case BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS:
483+ return "add/delete/balance/replace/resize operation "\
484+ "in progress";
485+ default:
486+ return NULL;
487+ }
488+}
489+
450490 #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \
451491 struct btrfs_ioctl_vol_args)
452492 #define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \
@@ -530,6 +570,7 @@ struct btrfs_ioctl_send_args { · 77 unmodified lines
530570 struct btrfs_ioctl_quota_rescan_args)
531571 #define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \
532572 struct btrfs_ioctl_quota_rescan_args)
573+#define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46)
533574 #define BTRFS_IOC_GET_FSLABEL _IOR(BTRFS_IOCTL_MAGIC, 49, \
534575 char[BTRFS_LABEL_SIZE])
535576 #define BTRFS_IOC_SET_FSLABEL _IOW(BTRFS_IOCTL_MAGIC, 50, \
@@ -538,5 +579,4 @@ struct btrfs_ioctl_send_args { · 2 unmodified lines
538579 struct btrfs_ioctl_get_dev_stats)
539580 #define BTRFS_IOC_DEV_REPLACE _IOWR(BTRFS_IOCTL_MAGIC, 53, \
540581 struct btrfs_ioctl_dev_replace_args)
541−
542582 #endif /* _UAPI_LINUX_BTRFS_H */
include/uapi/linux/const.h+3−0
@@ -21,4 +21,7 @@ · 20 unmodified lines
2121 #define _AT(T,X) ((T)(X))
2222 #endif
2323
24+#define _BITUL(x) (_AC(1,UL) << (x))
25+#define _BITULL(x) (_AC(1,ULL) << (x))
26+
2427 #endif /* !(_LINUX_CONST_H) */
include/uapi/linux/dm-ioctl.h+2−2
@@ -267,9 +267,9 @@ enum { · 266 unmodified lines
267267 #define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
268268
269269 #define DM_VERSION_MAJOR 4
270−#define DM_VERSION_MINOR 24
270+#define DM_VERSION_MINOR 25
271271 #define DM_VERSION_PATCHLEVEL 0
272−#define DM_VERSION_EXTRA "-ioctl (2013-01-15)"
272+#define DM_VERSION_EXTRA "-ioctl (2013-06-26)"
273273
274274 /* Status bits */
275275 #define DM_READONLY_FLAG (1 << 0) /* In/Out */
include/uapi/linux/ethtool.h+2−2
@@ -993,8 +993,8 @@ enum ethtool_sfeatures_retval_bits { · 992 unmodified lines
993993 #define PORT_OTHER 0xff
994994
995995 /* Which transceiver to use. */
996−#define XCVR_INTERNAL 0x00
997−#define XCVR_EXTERNAL 0x01
996+#define XCVR_INTERNAL 0x00 /* PHY and MAC are in the same package */
997+#define XCVR_EXTERNAL 0x01 /* PHY and MAC are in different packages */
998998 #define XCVR_DUMMY1 0x02
999999 #define XCVR_DUMMY2 0x03
10001000 #define XCVR_DUMMY3 0x04
include/uapi/linux/gen_stats.h+11−0
@@ -9,6 +9,7 @@ enum { · 8 unmodified lines
99 TCA_STATS_RATE_EST,
1010 TCA_STATS_QUEUE,
1111 TCA_STATS_APP,
12+ TCA_STATS_RATE_EST64,
1213 __TCA_STATS_MAX,
1314 };
1415 #define TCA_STATS_MAX (__TCA_STATS_MAX - 1)
@@ -37,6 +38,16 @@ struct gnet_stats_rate_est { · 22 unmodified lines
3738 __u32 pps;
3839 };
3940
41+/**
42+ * struct gnet_stats_rate_est64 - rate estimator
43+ * @bps: current byte rate
44+ * @pps: current packet rate
45+ */
46+struct gnet_stats_rate_est64 {
47+ __u64 bps;
48+ __u64 pps;
49+};
50+
4051 /**
4152 * struct gnet_stats_queue - queuing statistics
4253 * @qlen: queue length
include/uapi/linux/if_arp.h+1−0
@@ -93,6 +93,7 @@ · 92 unmodified lines
9393 #define ARPHRD_PHONET_PIPE 821 /* PhoNet pipe header */
9494 #define ARPHRD_CAIF 822 /* CAIF media type */
9595 #define ARPHRD_IP6GRE 823 /* GRE over IPv6 */
96+#define ARPHRD_NETLINK 824 /* Netlink header */
9697
9798 #define ARPHRD_VOID 0xFFFF /* Void type, nothing is known */
9899 #define ARPHRD_NONE 0xFFFE /* zero header length */
include/uapi/linux/if_link.h+15−0
@@ -221,6 +221,8 @@ enum { · 220 unmodified lines
221221 IFLA_BRPORT_GUARD, /* bpdu guard */
222222 IFLA_BRPORT_PROTECT, /* root port protection */
223223 IFLA_BRPORT_FAST_LEAVE, /* multicast fast leave */
224+ IFLA_BRPORT_LEARNING, /* mac learning */
225+ IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */
224226 __IFLA_BRPORT_MAX
225227 };
226228 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -336,6 +338,7 @@ enum { · 109 unmodified lines
336338 IFLA_VF_VLAN,
337339 IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */
338340 IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */
341+ IFLA_VF_LINK_STATE, /* link state enable/disable/auto switch */
339342 __IFLA_VF_MAX,
340343 };
341344
@@ -362,6 +365,18 @@ struct ifla_vf_spoofchk { · 20 unmodified lines
362365 __u32 setting;
363366 };
364367
368+enum {
369+ IFLA_VF_LINK_STATE_AUTO, /* link state of the uplink */
370+ IFLA_VF_LINK_STATE_ENABLE, /* link always up */
371+ IFLA_VF_LINK_STATE_DISABLE, /* link always down */
372+ __IFLA_VF_LINK_STATE_MAX,
373+};
374+
375+struct ifla_vf_link_state {
376+ __u32 vf;
377+ __u32 link_state;
378+};
379+
365380 /* VF ports management section
366381 *
367382 * Nested layout of set/get msg is:
include/uapi/linux/if_pppox.h+2−2
@@ -135,11 +135,11 @@ struct pppoe_tag { · 134 unmodified lines
135135
136136 struct pppoe_hdr {
137137 #if defined(__LITTLE_ENDIAN_BITFIELD)
138− __u8 ver : 4;
139138 __u8 type : 4;
139+ __u8 ver : 4;
140140 #elif defined(__BIG_ENDIAN_BITFIELD)
141− __u8 type : 4;
142141 __u8 ver : 4;
142+ __u8 type : 4;
143143 #else
144144 #error "Please fix <asm/byteorder.h>"
145145 #endif
include/uapi/linux/if_tun.h+2−0
@@ -68,6 +68,8 @@ · 67 unmodified lines
6868 #define IFF_MULTI_QUEUE 0x0100
6969 #define IFF_ATTACH_QUEUE 0x0200
7070 #define IFF_DETACH_QUEUE 0x0400
71+/* read-only flag */
72+#define IFF_PERSIST 0x0800
7173
7274 /* Features for GSO (TUNSETOFFLOAD). */
7375 #define TUN_F_CSUM 0x01 /* You can hand me unchecksummed packets. */
include/uapi/linux/input.h+13−4
@@ -506,11 +506,15 @@ struct input_keymap_entry { · 505 unmodified lines
506506 #define BTN_DEAD 0x12f
507507
508508 #define BTN_GAMEPAD 0x130
509−#define BTN_A 0x130
510−#define BTN_B 0x131
509+#define BTN_SOUTH 0x130
510+#define BTN_A BTN_SOUTH
511+#define BTN_EAST 0x131
512+#define BTN_B BTN_EAST
511513 #define BTN_C 0x132
512−#define BTN_X 0x133
513−#define BTN_Y 0x134
514+#define BTN_NORTH 0x133
515+#define BTN_X BTN_NORTH
516+#define BTN_WEST 0x134
517+#define BTN_Y BTN_WEST
514518 #define BTN_Z 0x135
515519 #define BTN_TL 0x136
516520 #define BTN_TR 0x137
@@ -707,6 +711,11 @@ struct input_keymap_entry { · 190 unmodified lines
707711 #define KEY_ATTENDANT_TOGGLE 0x21d /* Attendant call on or off */
708712 #define KEY_LIGHTS_TOGGLE 0x21e /* Reading light on or off */
709713
714+#define BTN_DPAD_UP 0x220
715+#define BTN_DPAD_DOWN 0x221
716+#define BTN_DPAD_LEFT 0x222
717+#define BTN_DPAD_RIGHT 0x223
718+
710719 #define BTN_TRIGGER_HAPPY 0x2c0
711720 #define BTN_TRIGGER_HAPPY1 0x2c0
712721 #define BTN_TRIGGER_HAPPY2 0x2c1
include/uapi/linux/ip_vs.h+6−0
@@ -20,6 +20,12 @@ · 19 unmodified lines
2020 #define IP_VS_SVC_F_PERSISTENT 0x0001 /* persistent port */
2121 #define IP_VS_SVC_F_HASHED 0x0002 /* hashed entry */
2222 #define IP_VS_SVC_F_ONEPACKET 0x0004 /* one-packet scheduling */
23+#define IP_VS_SVC_F_SCHED1 0x0008 /* scheduler flag 1 */
24+#define IP_VS_SVC_F_SCHED2 0x0010 /* scheduler flag 2 */
25+#define IP_VS_SVC_F_SCHED3 0x0020 /* scheduler flag 3 */
26+
27+#define IP_VS_SVC_F_SCHED_SH_FALLBACK IP_VS_SVC_F_SCHED1 /* SH fallback */
28+#define IP_VS_SVC_F_SCHED_SH_PORT IP_VS_SVC_F_SCHED2 /* SH use port */
2329
2430 /*
2531 * Destination Server Flags
include/uapi/linux/kvm.h+2−0
@@ -666,6 +666,7 @@ struct kvm_ppc_smmu_info { · 665 unmodified lines
666666 #define KVM_CAP_IRQ_MPIC 90
667667 #define KVM_CAP_PPC_RTAS 91
668668 #define KVM_CAP_IRQ_XICS 92
669+#define KVM_CAP_ARM_EL1_32BIT 93
669670
670671 #ifdef KVM_CAP_IRQ_ROUTING
671672
@@ -783,6 +784,7 @@ struct kvm_dirty_tlb { · 111 unmodified lines
783784 #define KVM_REG_IA64 0x3000000000000000ULL
784785 #define KVM_REG_ARM 0x4000000000000000ULL
785786 #define KVM_REG_S390 0x5000000000000000ULL
787+#define KVM_REG_ARM64 0x6000000000000000ULL
786788 #define KVM_REG_MIPS 0x7000000000000000ULL
787789
788790 #define KVM_REG_SIZE_SHIFT 52
include/uapi/linux/msdos_fs.h+10−0
@@ -104,6 +104,8 @@ struct __fat_dirent { · 103 unmodified lines
104104 /* <linux/videotext.h> has used 0x72 ('r') in collision, so skip a few */
105105 #define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32)
106106 #define FAT_IOCTL_SET_ATTRIBUTES _IOW('r', 0x11, __u32)
107+/*Android kernel has used 0x12, so we use 0x13*/
108+#define FAT_IOCTL_GET_VOLUME_ID _IOR('r', 0x13, __u32)
107109
108110 struct fat_boot_sector {
109111 __u8 ignored[3]; /* Boot strap short or near jump */
@@ -128,6 +130,10 @@ struct fat_boot_sector { · 18 unmodified lines
128130 __u8 drive_number; /* Physical drive number */
129131 __u8 state; /* undocumented, but used
130132 for mount state. */
133+ __u8 signature; /* extended boot signature */
134+ __u8 vol_id[4]; /* volume ID */
135+ __u8 vol_label[11]; /* volume label */
136+ __u8 fs_type[8]; /* file system type */
131137 /* other fiealds are not added here */
132138 } fat16;
133139
@@ -147,6 +153,10 @@ struct fat_boot_sector { · 13 unmodified lines
147153 __u8 drive_number; /* Physical drive number */
148154 __u8 state; /* undocumented, but used
149155 for mount state. */
156+ __u8 signature; /* extended boot signature */
157+ __u8 vol_id[4]; /* volume ID */
158+ __u8 vol_label[11]; /* volume label */
159+ __u8 fs_type[8]; /* file system type */
150160 /* other fiealds are not added here */
151161 } fat32;
152162 };
include/uapi/linux/netfilter/nfnetlink_queue.h+2−0
@@ -105,5 +105,7 @@ enum nfqnl_attr_config { · 104 unmodified lines
105105 #define NFQA_SKB_CSUMNOTREADY (1 << 0)
106106 /* packet is GSO (i.e., exceeds device mtu) */
107107 #define NFQA_SKB_GSO (1 << 1)
108+/* csum not validated (incoming device doesn't support hw checksum, etc.) */
109+#define NFQA_SKB_CSUM_NOTVERIFIED (1 << 2)
108110
109111 #endif /* _NFNETLINK_QUEUE_H */
include/uapi/linux/netfilter/xt_socket.h+7−0
@@ -5,10 +5,17 @@ · 4 unmodified lines
55
66 enum {
77 XT_SOCKET_TRANSPARENT = 1 << 0,
8+ XT_SOCKET_NOWILDCARD = 1 << 1,
89 };
910
1011 struct xt_socket_mtinfo1 {
1112 __u8 flags;
1213 };
14+#define XT_SOCKET_FLAGS_V1 XT_SOCKET_TRANSPARENT
15+
16+struct xt_socket_mtinfo2 {
17+ __u8 flags;
18+};
19+#define XT_SOCKET_FLAGS_V2 (XT_SOCKET_TRANSPARENT | XT_SOCKET_NOWILDCARD)
1320
1421 #endif /* _XT_SOCKET_H */
include/uapi/linux/nfc.h+17−1
@@ -69,6 +69,8 @@ · 68 unmodified lines
6969 * starting a poll from a device which has a secure element enabled means
7070 * we want to do SE based card emulation.
7171 * @NFC_CMD_DISABLE_SE: Disable the physical link to a specific secure element.
72+ * @NFC_CMD_FW_UPLOAD: Request to Load/flash firmware, or event to inform that
73+ * some firmware was loaded
7274 */
7375 enum nfc_commands {
7476 NFC_CMD_UNSPEC,
@@ -92,6 +94,9 @@ enum nfc_commands { · 17 unmodified lines
9294 NFC_CMD_DISABLE_SE,
9395 NFC_CMD_LLC_SDREQ,
9496 NFC_EVENT_LLC_SDRES,
97+ NFC_CMD_FW_UPLOAD,
98+ NFC_EVENT_SE_ADDED,
99+ NFC_EVENT_SE_REMOVED,
95100 /* private: internal use only */
96101 __NFC_CMD_AFTER_LAST
97102 };
@@ -121,6 +126,9 @@ enum nfc_commands { · 23 unmodified lines
121126 * @NFC_ATTR_LLC_PARAM_RW: Receive Window size parameter
122127 * @NFC_ATTR_LLC_PARAM_MIUX: MIU eXtension parameter
123128 * @NFC_ATTR_SE: Available Secure Elements
129+ * @NFC_ATTR_FIRMWARE_NAME: Free format firmware version
130+ * @NFC_ATTR_SE_INDEX: Secure element index
131+ * @NFC_ATTR_SE_TYPE: Secure element type (UICC or EMBEDDED)
124132 */
125133 enum nfc_attrs {
126134 NFC_ATTR_UNSPEC,
@@ -143,6 +151,9 @@ enum nfc_attrs { · 16 unmodified lines
143151 NFC_ATTR_LLC_PARAM_MIUX,
144152 NFC_ATTR_SE,
145153 NFC_ATTR_LLC_SDP,
154+ NFC_ATTR_FIRMWARE_NAME,
155+ NFC_ATTR_SE_INDEX,
156+ NFC_ATTR_SE_TYPE,
146157 /* private: internal use only */
147158 __NFC_ATTR_AFTER_LAST
148159 };
@@ -159,9 +170,12 @@ enum nfc_sdp_attr { · 10 unmodified lines
159170
160171 #define NFC_DEVICE_NAME_MAXSIZE 8
161172 #define NFC_NFCID1_MAXSIZE 10
173+#define NFC_NFCID2_MAXSIZE 8
174+#define NFC_NFCID3_MAXSIZE 10
162175 #define NFC_SENSB_RES_MAXSIZE 12
163176 #define NFC_SENSF_RES_MAXSIZE 18
164177 #define NFC_GB_MAXSIZE 48
178+#define NFC_FIRMWARE_NAME_MAXSIZE 32
165179
166180 /* NFC protocols */
167181 #define NFC_PROTO_JEWEL 1
@@ -191,10 +205,12 @@ enum nfc_sdp_attr { · 23 unmodified lines
191205 #define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)
192206
193207 /* NFC Secure Elements */
194−#define NFC_SE_NONE 0x0
195208 #define NFC_SE_UICC 0x1
196209 #define NFC_SE_EMBEDDED 0x2
197210
211+#define NFC_SE_DISABLED 0x0
212+#define NFC_SE_ENABLED 0x1
213+
198214 struct sockaddr_nfc {
199215 sa_family_t sa_family;
200216 __u32 dev_idx;
include/uapi/linux/nl80211.h+37−0
@@ -27,6 +27,8 @@ · 26 unmodified lines
2727
2828 #include <linux/types.h>
2929
30+#define NL80211_GENL_NAME "nl80211"
31+
3032 /**
3133 * DOC: Station handling
3234 *
@@ -1429,6 +1431,11 @@ enum nl80211_commands { · 1396 unmodified lines
14291431 * @NL80211_ATTR_MAX_CRIT_PROT_DURATION: duration in milliseconds in which
14301432 * the connection should have increased reliability (u16).
14311433 *
1434+ * @NL80211_ATTR_PEER_AID: Association ID for the peer TDLS station (u16).
1435+ * This is similar to @NL80211_ATTR_STA_AID but with a difference of being
1436+ * allowed to be used with the first @NL80211_CMD_SET_STATION command to
1437+ * update a TDLS peer STA entry.
1438+ *
14321439 * @NL80211_ATTR_MAX: highest attribute number currently defined
14331440 * @__NL80211_ATTR_AFTER_LAST: internal use
14341441 */
@@ -1727,6 +1734,8 @@ enum nl80211_attrs { · 292 unmodified lines
17271734 NL80211_ATTR_CRIT_PROT_ID,
17281735 NL80211_ATTR_MAX_CRIT_PROT_DURATION,
17291736
1737+ NL80211_ATTR_PEER_AID,
1738+
17301739 /* add attributes here, update the policy in nl80211.c */
17311740
17321741 __NL80211_ATTR_AFTER_LAST,
@@ -1991,6 +2000,10 @@ enum nl80211_sta_bss_param { · 258 unmodified lines
19912000 * @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode
19922001 * @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards
19932002 * non-peer STA
2003+ * @NL80211_STA_INFO_CHAIN_SIGNAL: per-chain signal strength of last PPDU
2004+ * Contains a nested array of signal strength attributes (u8, dBm)
2005+ * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average
2006+ * Same format as NL80211_STA_INFO_CHAIN_SIGNAL.
19942007 * @__NL80211_STA_INFO_AFTER_LAST: internal
19952008 * @NL80211_STA_INFO_MAX: highest possible station info attribute
19962009 */
@@ -2020,6 +2033,8 @@ enum nl80211_sta_info { · 23 unmodified lines
20202033 NL80211_STA_INFO_NONPEER_PM,
20212034 NL80211_STA_INFO_RX_BYTES64,
20222035 NL80211_STA_INFO_TX_BYTES64,
2036+ NL80211_STA_INFO_CHAIN_SIGNAL,
2037+ NL80211_STA_INFO_CHAIN_SIGNAL_AVG,
20232038
20242039 /* keep last */
20252040 __NL80211_STA_INFO_AFTER_LAST,
@@ -2413,6 +2428,8 @@ enum nl80211_survey_info { · 387 unmodified lines
24132428 * @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering
24142429 * @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing.
24152430 * overrides all other flags.
2431+ * @NL80211_MNTR_FLAG_ACTIVE: use the configured MAC address
2432+ * and ACK incoming unicast packets.
24162433 *
24172434 * @__NL80211_MNTR_FLAG_AFTER_LAST: internal use
24182435 * @NL80211_MNTR_FLAG_MAX: highest possible monitor flag
@@ -2424,6 +2441,7 @@ enum nl80211_mntr_flags { · 5 unmodified lines
24242441 NL80211_MNTR_FLAG_CONTROL,
24252442 NL80211_MNTR_FLAG_OTHER_BSS,
24262443 NL80211_MNTR_FLAG_COOK_FRAMES,
2444+ NL80211_MNTR_FLAG_ACTIVE,
24272445
24282446 /* keep last */
24292447 __NL80211_MNTR_FLAG_AFTER_LAST,
@@ -2559,6 +2577,10 @@ enum nl80211_mesh_power_mode { · 129 unmodified lines
25592577 *
25602578 * @NL80211_MESHCONF_AWAKE_WINDOW: awake window duration (in TUs)
25612579 *
2580+ * @NL80211_MESHCONF_PLINK_TIMEOUT: If no tx activity is seen from a STA we've
2581+ * established peering with for longer than this time (in seconds), then
2582+ * remove it from the STA's list of peers. Default is 30 minutes.
2583+ *
25622584 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
25632585 */
25642586 enum nl80211_meshconf_params {
@@ -2590,6 +2612,7 @@ enum nl80211_meshconf_params { · 25 unmodified lines
25902612 NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
25912613 NL80211_MESHCONF_POWER_MODE,
25922614 NL80211_MESHCONF_AWAKE_WINDOW,
2615+ NL80211_MESHCONF_PLINK_TIMEOUT,
25932616
25942617 /* keep last */
25952618 __NL80211_MESHCONF_ATTR_AFTER_LAST,
@@ -2637,6 +2660,10 @@ enum nl80211_meshconf_params { · 41 unmodified lines
26372660 * @NL80211_MESH_SETUP_USERSPACE_MPM: Enable this option if userspace will
26382661 * implement an MPM which handles peer allocation and state.
26392662 *
2663+ * @NL80211_MESH_SETUP_AUTH_PROTOCOL: Inform the kernel of the authentication
2664+ * method (u8, as defined in IEEE 8.4.2.100.6, e.g. 0x1 for SAE).
2665+ * Default is no authentication method required.
2666+ *
26402667 * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
26412668 *
26422669 * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
@@ -2650,6 +2677,7 @@ enum nl80211_mesh_setup_params { · 7 unmodified lines
26502677 NL80211_MESH_SETUP_USERSPACE_AMPE,
26512678 NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC,
26522679 NL80211_MESH_SETUP_USERSPACE_MPM,
2680+ NL80211_MESH_SETUP_AUTH_PROTOCOL,
26532681
26542682 /* keep last */
26552683 __NL80211_MESH_SETUP_ATTR_AFTER_LAST,
@@ -2730,6 +2758,8 @@ enum nl80211_channel_type { · 74 unmodified lines
27302758 * and %NL80211_ATTR_CENTER_FREQ2 attributes must be provided as well
27312759 * @NL80211_CHAN_WIDTH_160: 160 MHz channel, the %NL80211_ATTR_CENTER_FREQ1
27322760 * attribute must be provided as well
2761+ * @NL80211_CHAN_WIDTH_5: 5 MHz OFDM channel
2762+ * @NL80211_CHAN_WIDTH_10: 10 MHz OFDM channel
27332763 */
27342764 enum nl80211_chan_width {
27352765 NL80211_CHAN_WIDTH_20_NOHT,
@@ -2738,6 +2768,8 @@ enum nl80211_chan_width { · 2 unmodified lines
27382768 NL80211_CHAN_WIDTH_80,
27392769 NL80211_CHAN_WIDTH_80P80,
27402770 NL80211_CHAN_WIDTH_160,
2771+ NL80211_CHAN_WIDTH_5,
2772+ NL80211_CHAN_WIDTH_10,
27412773 };
27422774
27432775 /**
@@ -3556,6 +3588,10 @@ enum nl80211_ap_sme_features { · 812 unmodified lines
35563588 * Peering Management entity which may be implemented by registering for
35573589 * beacons or NL80211_CMD_NEW_PEER_CANDIDATE events. The mesh beacon is
35583590 * still generated by the driver.
3591+ * @NL80211_FEATURE_ACTIVE_MONITOR: This driver supports an active monitor
3592+ * interface. An active monitor interface behaves like a normal monitor
3593+ * interface, but gets added to the driver. It ensures that incoming
3594+ * unicast packets directed at the configured interface address get ACKed.
35593595 */
35603596 enum nl80211_feature_flags {
35613597 NL80211_FEATURE_SK_TX_STATUS = 1 << 0,
@@ -3575,6 +3611,7 @@ enum nl80211_feature_flags { · 13 unmodified lines
35753611 NL80211_FEATURE_ADVERTISE_CHAN_LIMITS = 1 << 14,
35763612 NL80211_FEATURE_FULL_AP_CLIENT_STATE = 1 << 15,
35773613 NL80211_FEATURE_USERSPACE_MPM = 1 << 16,
3614+ NL80211_FEATURE_ACTIVE_MONITOR = 1 << 17,
35783615 };
35793616
35803617 /**
include/uapi/linux/openvswitch.h+19−1
@@ -164,6 +164,7 @@ enum ovs_vport_type { · 163 unmodified lines
164164 OVS_VPORT_TYPE_UNSPEC,
165165 OVS_VPORT_TYPE_NETDEV, /* network device */
166166 OVS_VPORT_TYPE_INTERNAL, /* network device implemented by datapath */
167+ OVS_VPORT_TYPE_GRE, /* GRE tunnel. */
167168 __OVS_VPORT_TYPE_MAX
168169 };
169170
@@ -192,7 +193,6 @@ enum ovs_vport_type { · 22 unmodified lines
192193 * optional; if not specified a free port number is automatically selected.
193194 * Whether %OVS_VPORT_ATTR_OPTIONS is required or optional depends on the type
194195 * of vport.
195− * and other attributes are ignored.
196196 *
197197 * For other requests, if %OVS_VPORT_ATTR_NAME is specified then it is used to
198198 * look up the vport to operate on; otherwise dp_idx from the &struct
@@ -247,11 +247,29 @@ enum ovs_key_attr { · 48 unmodified lines
247247 OVS_KEY_ATTR_ARP, /* struct ovs_key_arp */
248248 OVS_KEY_ATTR_ND, /* struct ovs_key_nd */
249249 OVS_KEY_ATTR_SKB_MARK, /* u32 skb mark */
250+ OVS_KEY_ATTR_TUNNEL, /* Nested set of ovs_tunnel attributes */
251+
252+#ifdef __KERNEL__
253+ OVS_KEY_ATTR_IPV4_TUNNEL, /* struct ovs_key_ipv4_tunnel */
254+#endif
250255 __OVS_KEY_ATTR_MAX
251256 };
252257
253258 #define OVS_KEY_ATTR_MAX (__OVS_KEY_ATTR_MAX - 1)
254259
260+enum ovs_tunnel_key_attr {
261+ OVS_TUNNEL_KEY_ATTR_ID, /* be64 Tunnel ID */
262+ OVS_TUNNEL_KEY_ATTR_IPV4_SRC, /* be32 src IP address. */
263+ OVS_TUNNEL_KEY_ATTR_IPV4_DST, /* be32 dst IP address. */
264+ OVS_TUNNEL_KEY_ATTR_TOS, /* u8 Tunnel IP ToS. */
265+ OVS_TUNNEL_KEY_ATTR_TTL, /* u8 Tunnel IP TTL. */
266+ OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT, /* No argument, set DF. */
267+ OVS_TUNNEL_KEY_ATTR_CSUM, /* No argument. CSUM packet. */
268+ __OVS_TUNNEL_KEY_ATTR_MAX
269+};
270+
271+#define OVS_TUNNEL_KEY_ATTR_MAX (__OVS_TUNNEL_KEY_ATTR_MAX - 1)
272+
255273 /**
256274 * enum ovs_frag_type - IPv4 and IPv6 fragment type
257275 * @OVS_FRAG_TYPE_NONE: Packet is not a fragment.
include/uapi/linux/pci_regs.h+1−1
@@ -468,7 +468,7 @@ · 467 unmodified lines
468468 #define PCI_EXP_LNKCAP_ASPMS 0x00000c00 /* ASPM Support */
469469 #define PCI_EXP_LNKCAP_L0SEL 0x00007000 /* L0s Exit Latency */
470470 #define PCI_EXP_LNKCAP_L1EL 0x00038000 /* L1 Exit Latency */
471−#define PCI_EXP_LNKCAP_CLKPM 0x00040000 /* L1 Clock Power Management */
471+#define PCI_EXP_LNKCAP_CLKPM 0x00040000 /* Clock Power Management */
472472 #define PCI_EXP_LNKCAP_SDERC 0x00080000 /* Surprise Down Error Reporting Capable */
473473 #define PCI_EXP_LNKCAP_DLLLARC 0x00100000 /* Data Link Layer Link Active Reporting Capable */
474474 #define PCI_EXP_LNKCAP_LBNC 0x00200000 /* Link Bandwidth Notification Capability */
include/uapi/linux/perf_event.h+4−1
@@ -157,8 +157,11 @@ enum perf_branch_sample_type { · 156 unmodified lines
157157 PERF_SAMPLE_BRANCH_ANY_CALL = 1U << 4, /* any call branch */
158158 PERF_SAMPLE_BRANCH_ANY_RETURN = 1U << 5, /* any return branch */
159159 PERF_SAMPLE_BRANCH_IND_CALL = 1U << 6, /* indirect calls */
160+ PERF_SAMPLE_BRANCH_ABORT_TX = 1U << 7, /* transaction aborts */
161+ PERF_SAMPLE_BRANCH_IN_TX = 1U << 8, /* in transaction */
162+ PERF_SAMPLE_BRANCH_NO_TX = 1U << 9, /* not in transaction */
160163
161− PERF_SAMPLE_BRANCH_MAX = 1U << 7, /* non-ABI */
164+ PERF_SAMPLE_BRANCH_MAX = 1U << 10, /* non-ABI */
162165 };
163166
164167 #define PERF_SAMPLE_BRANCH_PLM_ALL \
include/uapi/linux/ptrace.h+3−0
@@ -61,6 +61,9 @@ struct ptrace_peeksiginfo_args { · 60 unmodified lines
6161 __s32 nr; /* how may siginfos to take */
6262 };
6363
64+#define PTRACE_GETSIGMASK 0x420a
65+#define PTRACE_SETSIGMASK 0x420b
66+
6467 /* Read signals from a shared (process wide) queue */
6568 #define PTRACE_PEEKSIGINFO_SHARED (1 << 0)
6669
include/uapi/linux/rtnetlink.h+2−0
@@ -386,6 +386,8 @@ enum { · 385 unmodified lines
386386 #define RTAX_RTO_MIN RTAX_RTO_MIN
387387 RTAX_INITRWND,
388388 #define RTAX_INITRWND RTAX_INITRWND
389+ RTAX_QUICKACK,
390+#define RTAX_QUICKACK RTAX_QUICKACK
389391 __RTAX_MAX
390392 };
391393
include/uapi/linux/serial_core.h+6−0
@@ -226,4 +226,10 @@ · 225 unmodified lines
226226 /* Rocketport EXPRESS/INFINITY */
227227 #define PORT_RP2 102
228228
229+/* Freescale lpuart */
230+#define PORT_LPUART 103
231+
232+/* SH-SCI */
233+#define PORT_HSCIF 104
234+
229235 #endif /* _UAPILINUX_SERIAL_CORE_H */
include/uapi/linux/snmp.h+2−0
@@ -253,6 +253,7 @@ enum · 252 unmodified lines
253253 LINUX_MIB_TCPFASTOPENLISTENOVERFLOW, /* TCPFastOpenListenOverflow */
254254 LINUX_MIB_TCPFASTOPENCOOKIEREQD, /* TCPFastOpenCookieReqd */
255255 LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES, /* TCPSpuriousRtxHostQueues */
256+ LINUX_MIB_LOWLATENCYRXPACKETS, /* LowLatencyRxPackets */
256257 __LINUX_MIB_MAX
257258 };
258259
@@ -287,6 +288,7 @@ enum · 28 unmodified lines
287288 LINUX_MIB_XFRMOUTPOLERROR, /* XfrmOutPolError */
288289 LINUX_MIB_XFRMFWDHDRERROR, /* XfrmFwdHdrError*/
289290 LINUX_MIB_XFRMOUTSTATEINVALID, /* XfrmOutStateInvalid */
291+ LINUX_MIB_XFRMACQUIREERROR, /* XfrmAcquireError */
290292 __LINUX_MIB_XFRMMAX
291293 };
292294
include/uapi/linux/tipc.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * include/linux/tipc.h: Include file for TIPC socket interface
2+ * include/uapi/linux/tipc.h: Header for TIPC socket interface
33 *
44 * Copyright (c) 2003-2006, Ericsson AB
55 * Copyright (c) 2005, 2010-2011, Wind River Systems
include/uapi/linux/tipc_config.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * include/linux/tipc_config.h: Include file for TIPC configuration interface
2+ * include/uapi/linux/tipc_config.h: Header for TIPC configuration interface
33 *
44 * Copyright (c) 2003-2006, Ericsson AB
55 * Copyright (c) 2005-2007, 2010-2011, Wind River Systems
include/uapi/linux/v4l2-controls.h+2−2
@@ -53,13 +53,13 @@ · 52 unmodified lines
5353 #define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */
5454 #define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */
5555 #define V4L2_CTRL_CLASS_CAMERA 0x009a0000 /* Camera class controls */
56−#define V4L2_CTRL_CLASS_FM_TX 0x009b0000 /* FM Modulator control class */
56+#define V4L2_CTRL_CLASS_FM_TX 0x009b0000 /* FM Modulator controls */
5757 #define V4L2_CTRL_CLASS_FLASH 0x009c0000 /* Camera flash controls */
5858 #define V4L2_CTRL_CLASS_JPEG 0x009d0000 /* JPEG-compression controls */
5959 #define V4L2_CTRL_CLASS_IMAGE_SOURCE 0x009e0000 /* Image source controls */
6060 #define V4L2_CTRL_CLASS_IMAGE_PROC 0x009f0000 /* Image processing controls */
6161 #define V4L2_CTRL_CLASS_DV 0x00a00000 /* Digital Video controls */
62−#define V4L2_CTRL_CLASS_FM_RX 0x00a10000 /* Digital Video controls */
62+#define V4L2_CTRL_CLASS_FM_RX 0x00a10000 /* FM Receiver controls */
6363
6464 /* User-class control IDs */
6565
include/uapi/linux/vfio.h+40−2
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 /* Extensions */
2323
2424 #define VFIO_TYPE1_IOMMU 1
25+#define VFIO_SPAPR_TCE_IOMMU 2
2526
2627 /*
2728 * The IOCTL interface is designed for extensibility by embedding the
@@ -361,10 +362,14 @@ struct vfio_iommu_type1_dma_map { · 333 unmodified lines
361362 #define VFIO_IOMMU_MAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 13)
362363
363364 /**
364− * VFIO_IOMMU_UNMAP_DMA - _IOW(VFIO_TYPE, VFIO_BASE + 14, struct vfio_dma_unmap)
365+ * VFIO_IOMMU_UNMAP_DMA - _IOWR(VFIO_TYPE, VFIO_BASE + 14,
366+ * struct vfio_dma_unmap)
365367 *
366368 * Unmap IO virtual addresses using the provided struct vfio_dma_unmap.
367− * Caller sets argsz.
369+ * Caller sets argsz. The actual unmapped size is returned in the size
370+ * field. No guarantee is made to the user that arbitrary unmaps of iova
371+ * or size different from those used in the original mapping call will
372+ * succeed.
368373 */
369374 struct vfio_iommu_type1_dma_unmap {
370375 __u32 argsz;
@@ -375,4 +380,37 @@ struct vfio_iommu_type1_dma_unmap { · 4 unmodified lines
375380
376381 #define VFIO_IOMMU_UNMAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 14)
377382
383+/*
384+ * IOCTLs to enable/disable IOMMU container usage.
385+ * No parameters are supported.
386+ */
387+#define VFIO_IOMMU_ENABLE _IO(VFIO_TYPE, VFIO_BASE + 15)
388+#define VFIO_IOMMU_DISABLE _IO(VFIO_TYPE, VFIO_BASE + 16)
389+
390+/* -------- Additional API for SPAPR TCE (Server POWERPC) IOMMU -------- */
391+
392+/*
393+ * The SPAPR TCE info struct provides the information about the PCI bus
394+ * address ranges available for DMA, these values are programmed into
395+ * the hardware so the guest has to know that information.
396+ *
397+ * The DMA 32 bit window start is an absolute PCI bus address.
398+ * The IOVA address passed via map/unmap ioctls are absolute PCI bus
399+ * addresses too so the window works as a filter rather than an offset
400+ * for IOVA addresses.
401+ *
402+ * A flag will need to be added if other page sizes are supported,
403+ * so as defined here, it is always 4k.
404+ */
405+struct vfio_iommu_spapr_tce_info {
406+ __u32 argsz;
407+ __u32 flags; /* reserved for future use */
408+ __u32 dma32_window_start; /* 32 bit window start (bytes) */
409+ __u32 dma32_window_size; /* 32 bit window size (bytes) */
410+};
411+
412+#define VFIO_IOMMU_SPAPR_TCE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
413+
414+/* ***************************************************************** */
415+
378416 #endif /* _UAPIVFIO_H */
include/uapi/linux/videodev2.h+8−19
@@ -395,7 +395,7 @@ struct v4l2_pix_format { · 394 unmodified lines
395395 #define V4L2_PIX_FMT_H263 v4l2_fourcc('H', '2', '6', '3') /* H263 */
396396 #define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES */
397397 #define V4L2_PIX_FMT_MPEG2 v4l2_fourcc('M', 'P', 'G', '2') /* MPEG-2 ES */
398−#define V4L2_PIX_FMT_MPEG4 v4l2_fourcc('M', 'P', 'G', '4') /* MPEG-4 ES */
398+#define V4L2_PIX_FMT_MPEG4 v4l2_fourcc('M', 'P', 'G', '4') /* MPEG-4 part 2 ES */
399399 #define V4L2_PIX_FMT_XVID v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid */
400400 #define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */
401401 #define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */
@@ -555,7 +555,7 @@ struct v4l2_jpegcompression { · 153 unmodified lines
555555 __u32 jpeg_markers; /* Which markers should go into the JPEG
556556 * output. Unless you exactly know what
557557 * you do, leave them untouched.
558− * Inluding less markers will make the
558+ * Including less markers will make the
559559 * resulting code smaller, but there will
560560 * be fewer applications which can read it.
561561 * The presence of the APP and COM marker
@@ -567,7 +567,7 @@ struct v4l2_jpegcompression { · 5 unmodified lines
567567 #define V4L2_JPEG_MARKER_DRI (1<<5) /* Define Restart Interval */
568568 #define V4L2_JPEG_MARKER_COM (1<<6) /* Comment segment */
569569 #define V4L2_JPEG_MARKER_APP (1<<7) /* App segment, driver will
570− * allways use APP0 */
570+ * always use APP0 */
571571 };
572572
573573 /*
@@ -900,7 +900,7 @@ typedef __u64 v4l2_std_id; · 326 unmodified lines
900900 /*
901901 * "Common" PAL - This macro is there to be compatible with the old
902902 * V4L1 concept of "PAL": /BGDKHI.
903− * Several PAL standards are mising here: /M, /N and /Nc
903+ * Several PAL standards are missing here: /M, /N and /Nc
904904 */
905905 #define V4L2_STD_PAL (V4L2_STD_PAL_BG |\
906906 V4L2_STD_PAL_DK |\
@@ -1787,11 +1787,13 @@ struct v4l2_event_subscription { · 880 unmodified lines
17871787 /* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
17881788
17891789 #define V4L2_CHIP_MATCH_BRIDGE 0 /* Match against chip ID on the bridge (0 for the bridge) */
1790+#define V4L2_CHIP_MATCH_SUBDEV 4 /* Match against subdev index */
1791+
1792+/* The following four defines are no longer in use */
17901793 #define V4L2_CHIP_MATCH_HOST V4L2_CHIP_MATCH_BRIDGE
17911794 #define V4L2_CHIP_MATCH_I2C_DRIVER 1 /* Match against I2C driver name */
17921795 #define V4L2_CHIP_MATCH_I2C_ADDR 2 /* Match against I2C 7-bit address */
1793−#define V4L2_CHIP_MATCH_AC97 3 /* Match against anciliary AC97 chip */
1794−#define V4L2_CHIP_MATCH_SUBDEV 4 /* Match against subdev index */
1796+#define V4L2_CHIP_MATCH_AC97 3 /* Match against ancillary AC97 chip */
17951797
17961798 struct v4l2_dbg_match {
17971799 __u32 type; /* Match type */
@@ -1808,13 +1810,6 @@ struct v4l2_dbg_register { · 10 unmodified lines
18081810 __u64 val;
18091811 } __attribute__ ((packed));
18101812
1811−/* VIDIOC_DBG_G_CHIP_IDENT */
1812−struct v4l2_dbg_chip_ident {
1813− struct v4l2_dbg_match match;
1814− __u32 ident; /* chip identifier as specified in <media/v4l2-chip-ident.h> */
1815− __u32 revision; /* chip revision, chip specific */
1816−} __attribute__ ((packed));
1817−
18181813 #define V4L2_CHIP_FL_READABLE (1 << 0)
18191814 #define V4L2_CHIP_FL_WRITABLE (1 << 1)
18201815
@@ -1915,12 +1910,6 @@ struct v4l2_create_buffers { · 94 unmodified lines
19151910 #define VIDIOC_DBG_S_REGISTER _IOW('V', 79, struct v4l2_dbg_register)
19161911 #define VIDIOC_DBG_G_REGISTER _IOWR('V', 80, struct v4l2_dbg_register)
19171912
1918−/* Experimental, meant for debugging, testing and internal use.
1919− Never use this ioctl in applications!
1920− Note: this ioctl is deprecated in favor of VIDIOC_DBG_G_CHIP_INFO and
1921− will go away in the future. */
1922−#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
1923−
19241913 #define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek)
19251914
19261915 #define VIDIOC_S_DV_TIMINGS _IOWR('V', 87, struct v4l2_dv_timings)
include/uapi/linux/virtio_config.h+3−0
@@ -51,4 +51,7 @@ · 50 unmodified lines
5151 * suppressed them? */
5252 #define VIRTIO_F_NOTIFY_ON_EMPTY 24
5353
54+/* Can the device handle any descriptor layout? */
55+#define VIRTIO_F_ANY_LAYOUT 27
56+
5457 #endif /* _UAPI_LINUX_VIRTIO_CONFIG_H */
include/uapi/linux/virtio_console.h+3−0
@@ -38,6 +38,7 @@ · 37 unmodified lines
3838 /* Feature bits */
3939 #define VIRTIO_CONSOLE_F_SIZE 0 /* Does host provide console size? */
4040 #define VIRTIO_CONSOLE_F_MULTIPORT 1 /* Does host provide multiple ports? */
41+#define VIRTIO_CONSOLE_F_EMERG_WRITE 2 /* Does host support emergency write? */
4142
4243 #define VIRTIO_CONSOLE_BAD_ID (~(__u32)0)
4344
@@ -48,6 +49,8 @@ struct virtio_console_config { · 4 unmodified lines
4849 __u16 rows;
4950 /* max. number of ports this device can hold */
5051 __u32 max_nr_ports;
52+ /* emergency write register */
53+ __u32 emerg_wr;
5154 } __attribute__((packed));
5255
5356 /*
include/uapi/linux/virtio_pci.h+3−1
@@ -80,7 +80,9 @@ · 79 unmodified lines
8080
8181 /* The remaining space is defined by each driver as the per-driver
8282 * configuration space */
83−#define VIRTIO_PCI_CONFIG(dev) ((dev)->msix_enabled ? 24 : 20)
83+#define VIRTIO_PCI_CONFIG_OFF(msix_enabled) ((msix_enabled) ? 24 : 20)
84+/* Deprecated: please use VIRTIO_PCI_CONFIG_OFF instead */
85+#define VIRTIO_PCI_CONFIG(dev) VIRTIO_PCI_CONFIG_OFF((dev)->msix_enabled)
8486
8587 /* Virtio ABI version, this must match exactly */
8688 #define VIRTIO_PCI_ABI_VERSION 0
include/uapi/mtd/ubi-user.h+4−1
@@ -173,7 +173,10 @@ · 172 unmodified lines
173173
174174 #define UBI_VOL_IOC_MAGIC 'O'
175175
176−/* Start UBI volume update */
176+/* Start UBI volume update
177+ * Note: This actually takes a pointer (__s64*), but we can't change
178+ * that without breaking the ABI on 32bit systems
179+ */
177180 #define UBI_IOCVOLUP _IOW(UBI_VOL_IOC_MAGIC, 0, __s64)
178181 /* LEB erasure command, used for debugging, disabled by default */
179182 #define UBI_IOCEBER _IOW(UBI_VOL_IOC_MAGIC, 1, __s32)
include/uapi/rdma/rdma_user_cm.h+63−10
@@ -45,8 +45,8 @@ · 44 unmodified lines
4545 enum {
4646 RDMA_USER_CM_CMD_CREATE_ID,
4747 RDMA_USER_CM_CMD_DESTROY_ID,
48− RDMA_USER_CM_CMD_BIND_ADDR,
49− RDMA_USER_CM_CMD_RESOLVE_ADDR,
48+ RDMA_USER_CM_CMD_BIND_IP,
49+ RDMA_USER_CM_CMD_RESOLVE_IP,
5050 RDMA_USER_CM_CMD_RESOLVE_ROUTE,
5151 RDMA_USER_CM_CMD_QUERY_ROUTE,
5252 RDMA_USER_CM_CMD_CONNECT,
@@ -59,9 +59,13 @@ enum { · 6 unmodified lines
5959 RDMA_USER_CM_CMD_GET_OPTION,
6060 RDMA_USER_CM_CMD_SET_OPTION,
6161 RDMA_USER_CM_CMD_NOTIFY,
62− RDMA_USER_CM_CMD_JOIN_MCAST,
62+ RDMA_USER_CM_CMD_JOIN_IP_MCAST,
6363 RDMA_USER_CM_CMD_LEAVE_MCAST,
64− RDMA_USER_CM_CMD_MIGRATE_ID
64+ RDMA_USER_CM_CMD_MIGRATE_ID,
65+ RDMA_USER_CM_CMD_QUERY,
66+ RDMA_USER_CM_CMD_BIND,
67+ RDMA_USER_CM_CMD_RESOLVE_ADDR,
68+ RDMA_USER_CM_CMD_JOIN_MCAST
6569 };
6670
6771 /*
@@ -95,28 +99,51 @@ struct rdma_ucm_destroy_id_resp { · 27 unmodified lines
9599 __u32 events_reported;
96100 };
97101
98−struct rdma_ucm_bind_addr {
102+struct rdma_ucm_bind_ip {
99103 __u64 response;
100104 struct sockaddr_in6 addr;
101105 __u32 id;
102106 };
103107
104−struct rdma_ucm_resolve_addr {
108+struct rdma_ucm_bind {
109+ __u32 id;
110+ __u16 addr_size;
111+ __u16 reserved;
112+ struct sockaddr_storage addr;
113+};
114+
115+struct rdma_ucm_resolve_ip {
105116 struct sockaddr_in6 src_addr;
106117 struct sockaddr_in6 dst_addr;
107118 __u32 id;
108119 __u32 timeout_ms;
109120 };
110121
122+struct rdma_ucm_resolve_addr {
123+ __u32 id;
124+ __u32 timeout_ms;
125+ __u16 src_size;
126+ __u16 dst_size;
127+ __u32 reserved;
128+ struct sockaddr_storage src_addr;
129+ struct sockaddr_storage dst_addr;
130+};
131+
111132 struct rdma_ucm_resolve_route {
112133 __u32 id;
113134 __u32 timeout_ms;
114135 };
115136
116−struct rdma_ucm_query_route {
137+enum {
138+ RDMA_USER_CM_QUERY_ADDR,
139+ RDMA_USER_CM_QUERY_PATH,
140+ RDMA_USER_CM_QUERY_GID
141+};
142+
143+struct rdma_ucm_query {
117144 __u64 response;
118145 __u32 id;
119− __u32 reserved;
146+ __u32 option;
120147 };
121148
122149 struct rdma_ucm_query_route_resp {
@@ -129,9 +156,26 @@ struct rdma_ucm_query_route_resp { · 6 unmodified lines
129156 __u8 reserved[3];
130157 };
131158
159+struct rdma_ucm_query_addr_resp {
160+ __u64 node_guid;
161+ __u8 port_num;
162+ __u8 reserved;
163+ __u16 pkey;
164+ __u16 src_size;
165+ __u16 dst_size;
166+ struct sockaddr_storage src_addr;
167+ struct sockaddr_storage dst_addr;
168+};
169+
170+struct rdma_ucm_query_path_resp {
171+ __u32 num_paths;
172+ __u32 reserved;
173+ struct ib_path_rec_data path_data[0];
174+};
175+
132176 struct rdma_ucm_conn_param {
133177 __u32 qp_num;
134− __u32 reserved;
178+ __u32 qkey;
135179 __u8 private_data[RDMA_MAX_PRIVATE_DATA];
136180 __u8 private_data_len;
137181 __u8 srq;
@@ -192,13 +236,22 @@ struct rdma_ucm_notify { · 54 unmodified lines
192236 __u32 event;
193237 };
194238
195−struct rdma_ucm_join_mcast {
239+struct rdma_ucm_join_ip_mcast {
196240 __u64 response; /* rdma_ucm_create_id_resp */
197241 __u64 uid;
198242 struct sockaddr_in6 addr;
199243 __u32 id;
200244 };
201245
246+struct rdma_ucm_join_mcast {
247+ __u64 response; /* rdma_ucma_create_id_resp */
248+ __u64 uid;
249+ __u32 id;
250+ __u16 addr_size;
251+ __u16 reserved;
252+ struct sockaddr_storage addr;
253+};
254+
202255 struct rdma_ucm_get_event {
203256 __u64 response;
204257 };
include/uapi/sound/asound.h+2−0
@@ -817,6 +817,8 @@ typedef int __bitwise snd_ctl_elem_iface_t; · 816 unmodified lines
817817 #define SNDRV_CTL_POWER_D3hot (SNDRV_CTL_POWER_D3|0x0000) /* Off, with power */
818818 #define SNDRV_CTL_POWER_D3cold (SNDRV_CTL_POWER_D3|0x0001) /* Off, without power */
819819
820+#define SNDRV_CTL_ELEM_ID_NAME_MAXLEN 44
821+
820822 struct snd_ctl_elem_id {
821823 unsigned int numid; /* numeric identifier, zero = invalid */
822824 snd_ctl_elem_iface_t iface; /* interface identifier */

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