diff options
author | David S. Miller <davem@davemloft.net> | 2014-05-24 00:32:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-24 00:32:30 -0400 |
commit | 54e5c4def0614ab540fbdf68e45342a4af141702 (patch) | |
tree | 95a2f61c72336932e83d9e4180cd9739106d624b /include/uapi/linux | |
parent | be65de7174123e02477bd488db1a657caf0f9947 (diff) | |
parent | 1ee1ceafb572f1a925809168267a7962a4289de8 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/bonding/bond_alb.c
drivers/net/ethernet/altera/altera_msgdma.c
drivers/net/ethernet/altera/altera_sgdma.c
net/ipv6/xfrm6_output.c
Several cases of overlapping changes.
The xfrm6_output.c has a bug fix which overlaps the renaming
of skb->local_df to skb->ignore_df.
In the Altera TSE driver cases, the register access cleanups
in net-next overlapped with bug fixes done in net.
Similarly a bug fix to send ALB packets in the bonding driver using
the right source address overlaps with cleanups in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux')
-rw-r--r-- | include/uapi/linux/audit.h | 12 | ||||
-rw-r--r-- | include/uapi/linux/fuse.h | 22 | ||||
-rw-r--r-- | include/uapi/linux/nl80211.h | 4 |
3 files changed, 35 insertions, 3 deletions
diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h index dfa4c860ccef..b21ea454bd33 100644 --- a/include/uapi/linux/audit.h +++ b/include/uapi/linux/audit.h | |||
@@ -331,9 +331,17 @@ enum { | |||
331 | #define AUDIT_FAIL_PRINTK 1 | 331 | #define AUDIT_FAIL_PRINTK 1 |
332 | #define AUDIT_FAIL_PANIC 2 | 332 | #define AUDIT_FAIL_PANIC 2 |
333 | 333 | ||
334 | /* | ||
335 | * These bits disambiguate different calling conventions that share an | ||
336 | * ELF machine type, bitness, and endianness | ||
337 | */ | ||
338 | #define __AUDIT_ARCH_CONVENTION_MASK 0x30000000 | ||
339 | #define __AUDIT_ARCH_CONVENTION_MIPS64_N32 0x20000000 | ||
340 | |||
334 | /* distinguish syscall tables */ | 341 | /* distinguish syscall tables */ |
335 | #define __AUDIT_ARCH_64BIT 0x80000000 | 342 | #define __AUDIT_ARCH_64BIT 0x80000000 |
336 | #define __AUDIT_ARCH_LE 0x40000000 | 343 | #define __AUDIT_ARCH_LE 0x40000000 |
344 | |||
337 | #define AUDIT_ARCH_ALPHA (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) | 345 | #define AUDIT_ARCH_ALPHA (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) |
338 | #define AUDIT_ARCH_ARM (EM_ARM|__AUDIT_ARCH_LE) | 346 | #define AUDIT_ARCH_ARM (EM_ARM|__AUDIT_ARCH_LE) |
339 | #define AUDIT_ARCH_ARMEB (EM_ARM) | 347 | #define AUDIT_ARCH_ARMEB (EM_ARM) |
@@ -346,7 +354,11 @@ enum { | |||
346 | #define AUDIT_ARCH_MIPS (EM_MIPS) | 354 | #define AUDIT_ARCH_MIPS (EM_MIPS) |
347 | #define AUDIT_ARCH_MIPSEL (EM_MIPS|__AUDIT_ARCH_LE) | 355 | #define AUDIT_ARCH_MIPSEL (EM_MIPS|__AUDIT_ARCH_LE) |
348 | #define AUDIT_ARCH_MIPS64 (EM_MIPS|__AUDIT_ARCH_64BIT) | 356 | #define AUDIT_ARCH_MIPS64 (EM_MIPS|__AUDIT_ARCH_64BIT) |
357 | #define AUDIT_ARCH_MIPS64N32 (EM_MIPS|__AUDIT_ARCH_64BIT|\ | ||
358 | __AUDIT_ARCH_CONVENTION_MIPS64_N32) | ||
349 | #define AUDIT_ARCH_MIPSEL64 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) | 359 | #define AUDIT_ARCH_MIPSEL64 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) |
360 | #define AUDIT_ARCH_MIPSEL64N32 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE\ | ||
361 | __AUDIT_ARCH_CONVENTION_MIPS64_N32) | ||
350 | #define AUDIT_ARCH_OPENRISC (EM_OPENRISC) | 362 | #define AUDIT_ARCH_OPENRISC (EM_OPENRISC) |
351 | #define AUDIT_ARCH_PARISC (EM_PARISC) | 363 | #define AUDIT_ARCH_PARISC (EM_PARISC) |
352 | #define AUDIT_ARCH_PARISC64 (EM_PARISC|__AUDIT_ARCH_64BIT) | 364 | #define AUDIT_ARCH_PARISC64 (EM_PARISC|__AUDIT_ARCH_64BIT) |
diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h index cf4750e1bb49..40b5ca8a1b1f 100644 --- a/include/uapi/linux/fuse.h +++ b/include/uapi/linux/fuse.h | |||
@@ -96,6 +96,11 @@ | |||
96 | * | 96 | * |
97 | * 7.23 | 97 | * 7.23 |
98 | * - add FUSE_WRITEBACK_CACHE | 98 | * - add FUSE_WRITEBACK_CACHE |
99 | * - add time_gran to fuse_init_out | ||
100 | * - add reserved space to fuse_init_out | ||
101 | * - add FATTR_CTIME | ||
102 | * - add ctime and ctimensec to fuse_setattr_in | ||
103 | * - add FUSE_RENAME2 request | ||
99 | */ | 104 | */ |
100 | 105 | ||
101 | #ifndef _LINUX_FUSE_H | 106 | #ifndef _LINUX_FUSE_H |
@@ -191,6 +196,7 @@ struct fuse_file_lock { | |||
191 | #define FATTR_ATIME_NOW (1 << 7) | 196 | #define FATTR_ATIME_NOW (1 << 7) |
192 | #define FATTR_MTIME_NOW (1 << 8) | 197 | #define FATTR_MTIME_NOW (1 << 8) |
193 | #define FATTR_LOCKOWNER (1 << 9) | 198 | #define FATTR_LOCKOWNER (1 << 9) |
199 | #define FATTR_CTIME (1 << 10) | ||
194 | 200 | ||
195 | /** | 201 | /** |
196 | * Flags returned by the OPEN request | 202 | * Flags returned by the OPEN request |
@@ -348,6 +354,7 @@ enum fuse_opcode { | |||
348 | FUSE_BATCH_FORGET = 42, | 354 | FUSE_BATCH_FORGET = 42, |
349 | FUSE_FALLOCATE = 43, | 355 | FUSE_FALLOCATE = 43, |
350 | FUSE_READDIRPLUS = 44, | 356 | FUSE_READDIRPLUS = 44, |
357 | FUSE_RENAME2 = 45, | ||
351 | 358 | ||
352 | /* CUSE specific operations */ | 359 | /* CUSE specific operations */ |
353 | CUSE_INIT = 4096, | 360 | CUSE_INIT = 4096, |
@@ -426,6 +433,12 @@ struct fuse_rename_in { | |||
426 | uint64_t newdir; | 433 | uint64_t newdir; |
427 | }; | 434 | }; |
428 | 435 | ||
436 | struct fuse_rename2_in { | ||
437 | uint64_t newdir; | ||
438 | uint32_t flags; | ||
439 | uint32_t padding; | ||
440 | }; | ||
441 | |||
429 | struct fuse_link_in { | 442 | struct fuse_link_in { |
430 | uint64_t oldnodeid; | 443 | uint64_t oldnodeid; |
431 | }; | 444 | }; |
@@ -438,10 +451,10 @@ struct fuse_setattr_in { | |||
438 | uint64_t lock_owner; | 451 | uint64_t lock_owner; |
439 | uint64_t atime; | 452 | uint64_t atime; |
440 | uint64_t mtime; | 453 | uint64_t mtime; |
441 | uint64_t unused2; | 454 | uint64_t ctime; |
442 | uint32_t atimensec; | 455 | uint32_t atimensec; |
443 | uint32_t mtimensec; | 456 | uint32_t mtimensec; |
444 | uint32_t unused3; | 457 | uint32_t ctimensec; |
445 | uint32_t mode; | 458 | uint32_t mode; |
446 | uint32_t unused4; | 459 | uint32_t unused4; |
447 | uint32_t uid; | 460 | uint32_t uid; |
@@ -559,6 +572,9 @@ struct fuse_init_in { | |||
559 | uint32_t flags; | 572 | uint32_t flags; |
560 | }; | 573 | }; |
561 | 574 | ||
575 | #define FUSE_COMPAT_INIT_OUT_SIZE 8 | ||
576 | #define FUSE_COMPAT_22_INIT_OUT_SIZE 24 | ||
577 | |||
562 | struct fuse_init_out { | 578 | struct fuse_init_out { |
563 | uint32_t major; | 579 | uint32_t major; |
564 | uint32_t minor; | 580 | uint32_t minor; |
@@ -567,6 +583,8 @@ struct fuse_init_out { | |||
567 | uint16_t max_background; | 583 | uint16_t max_background; |
568 | uint16_t congestion_threshold; | 584 | uint16_t congestion_threshold; |
569 | uint32_t max_write; | 585 | uint32_t max_write; |
586 | uint32_t time_gran; | ||
587 | uint32_t unused[9]; | ||
570 | }; | 588 | }; |
571 | 589 | ||
572 | #define CUSE_INIT_INFO_MAX 4096 | 590 | #define CUSE_INIT_INFO_MAX 4096 |
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 406010d4def0..9922b9b828a2 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h | |||
@@ -3894,6 +3894,8 @@ enum nl80211_ap_sme_features { | |||
3894 | * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested | 3894 | * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested |
3895 | * to work properly to suppport receiving regulatory hints from | 3895 | * to work properly to suppport receiving regulatory hints from |
3896 | * cellular base stations. | 3896 | * cellular base stations. |
3897 | * @NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL: (no longer available, only | ||
3898 | * here to reserve the value for API/ABI compatibility) | ||
3897 | * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of | 3899 | * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of |
3898 | * equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station | 3900 | * equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station |
3899 | * mode | 3901 | * mode |
@@ -3938,7 +3940,7 @@ enum nl80211_feature_flags { | |||
3938 | NL80211_FEATURE_HT_IBSS = 1 << 1, | 3940 | NL80211_FEATURE_HT_IBSS = 1 << 1, |
3939 | NL80211_FEATURE_INACTIVITY_TIMER = 1 << 2, | 3941 | NL80211_FEATURE_INACTIVITY_TIMER = 1 << 2, |
3940 | NL80211_FEATURE_CELL_BASE_REG_HINTS = 1 << 3, | 3942 | NL80211_FEATURE_CELL_BASE_REG_HINTS = 1 << 3, |
3941 | /* bit 4 is reserved - don't use */ | 3943 | NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL = 1 << 4, |
3942 | NL80211_FEATURE_SAE = 1 << 5, | 3944 | NL80211_FEATURE_SAE = 1 << 5, |
3943 | NL80211_FEATURE_LOW_PRIORITY_SCAN = 1 << 6, | 3945 | NL80211_FEATURE_LOW_PRIORITY_SCAN = 1 << 6, |
3944 | NL80211_FEATURE_SCAN_FLUSH = 1 << 7, | 3946 | NL80211_FEATURE_SCAN_FLUSH = 1 << 7, |