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.
Showing the changes to include/uapi/linux (3 of 528 files). Show all
Unified · Split
| @@ -331,9 +331,17 @@ enum { · 330 unmodified lines | ||
| 331 | 331 | #define AUDIT_FAIL_PRINTK 1 |
| 332 | 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 | 341 | /* distinguish syscall tables */ |
| 335 | 342 | #define __AUDIT_ARCH_64BIT 0x80000000 |
| 336 | 343 | #define __AUDIT_ARCH_LE 0x40000000 |
| 344 | + | |
| 337 | 345 | #define AUDIT_ARCH_ALPHA (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) |
| 338 | 346 | #define AUDIT_ARCH_ARM (EM_ARM|__AUDIT_ARCH_LE) |
| 339 | 347 | #define AUDIT_ARCH_ARMEB (EM_ARM) |
| @@ -346,7 +354,11 @@ enum { · 6 unmodified lines | ||
| 346 | 354 | #define AUDIT_ARCH_MIPS (EM_MIPS) |
| 347 | 355 | #define AUDIT_ARCH_MIPSEL (EM_MIPS|__AUDIT_ARCH_LE) |
| 348 | 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 | 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 | 362 | #define AUDIT_ARCH_OPENRISC (EM_OPENRISC) |
| 351 | 363 | #define AUDIT_ARCH_PARISC (EM_PARISC) |
| 352 | 364 | #define AUDIT_ARCH_PARISC64 (EM_PARISC|__AUDIT_ARCH_64BIT) |
| @@ -96,6 +96,11 @@ · 95 unmodified lines | ||
| 96 | 96 | * |
| 97 | 97 | * 7.23 |
| 98 | 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 | 106 | #ifndef _LINUX_FUSE_H |
| @@ -191,6 +196,7 @@ struct fuse_file_lock { · 89 unmodified lines | ||
| 191 | 196 | #define FATTR_ATIME_NOW (1 << 7) |
| 192 | 197 | #define FATTR_MTIME_NOW (1 << 8) |
| 193 | 198 | #define FATTR_LOCKOWNER (1 << 9) |
| 199 | +#define FATTR_CTIME (1 << 10) | |
| 194 | 200 | |
| 195 | 201 | /** |
| 196 | 202 | * Flags returned by the OPEN request |
| @@ -348,6 +354,7 @@ enum fuse_opcode { · 151 unmodified lines | ||
| 348 | 354 | FUSE_BATCH_FORGET = 42, |
| 349 | 355 | FUSE_FALLOCATE = 43, |
| 350 | 356 | FUSE_READDIRPLUS = 44, |
| 357 | + FUSE_RENAME2 = 45, | |
| 351 | 358 | |
| 352 | 359 | /* CUSE specific operations */ |
| 353 | 360 | CUSE_INIT = 4096, |
| @@ -426,6 +433,12 @@ struct fuse_rename_in { · 72 unmodified lines | ||
| 426 | 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 | 442 | struct fuse_link_in { |
| 430 | 443 | uint64_t oldnodeid; |
| 431 | 444 | }; |
| @@ -438,10 +451,10 @@ struct fuse_setattr_in { · 6 unmodified lines | ||
| 438 | 451 | uint64_t lock_owner; |
| 439 | 452 | uint64_t atime; |
| 440 | 453 | uint64_t mtime; |
| 441 | − uint64_t unused2; | |
| 454 | + uint64_t ctime; | |
| 442 | 455 | uint32_t atimensec; |
| 443 | 456 | uint32_t mtimensec; |
| 444 | − uint32_t unused3; | |
| 457 | + uint32_t ctimensec; | |
| 445 | 458 | uint32_t mode; |
| 446 | 459 | uint32_t unused4; |
| 447 | 460 | uint32_t uid; |
| @@ -559,6 +572,9 @@ struct fuse_init_in { · 111 unmodified lines | ||
| 559 | 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 | 578 | struct fuse_init_out { |
| 563 | 579 | uint32_t major; |
| 564 | 580 | uint32_t minor; |
| @@ -567,6 +583,8 @@ struct fuse_init_out { · 2 unmodified lines | ||
| 567 | 583 | uint16_t max_background; |
| 568 | 584 | uint16_t congestion_threshold; |
| 569 | 585 | uint32_t max_write; |
| 586 | + uint32_t time_gran; | |
| 587 | + uint32_t unused[9]; | |
| 570 | 588 | }; |
| 571 | 589 | |
| 572 | 590 | #define CUSE_INIT_INFO_MAX 4096 |
| @@ -3894,6 +3894,8 @@ enum nl80211_ap_sme_features { · 3893 unmodified lines | ||
| 3894 | 3894 | * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested |
| 3895 | 3895 | * to work properly to suppport receiving regulatory hints from |
| 3896 | 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 | 3899 | * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of |
| 3898 | 3900 | * equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station |
| 3899 | 3901 | * mode |
| @@ -3938,7 +3940,7 @@ enum nl80211_feature_flags { · 38 unmodified lines | ||
| 3938 | 3940 | NL80211_FEATURE_HT_IBSS = 1 << 1, |
| 3939 | 3941 | NL80211_FEATURE_INACTIVITY_TIMER = 1 << 2, |
| 3940 | 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 | 3944 | NL80211_FEATURE_SAE = 1 << 5, |
| 3943 | 3945 | NL80211_FEATURE_LOW_PRIORITY_SCAN = 1 << 6, |
| 3944 | 3946 | NL80211_FEATURE_SCAN_FLUSH = 1 << 7, |