Linux 4.15-rc6 * tag 'v4.15-rc6': (734 commits) Linux 4.15-rc6 MAINTAINERS: mark arch/blackfin/ and its gubbins as orphaned x86/ldt: Make LDT pgtable free conditional x86/ldt: Plug memory leak in error path x86/mm: Remove preempt_disable/enable() from __native_flush_tlb() x86/smpboot: Remove stale TLB flush invocations objtool: Fix seg fault with clang-compiled objects objtool: Fix seg fault caused by missing parameter kbuild: add '-fno-stack-check' to kernel build options timerqueue: Document return values of timerqueue_add/del() timers: Invoke timer_start_debug() where it makes sense nohz: Prevent a timer interrupt storm in tick_nohz_stop_sched_tick() timers: Reinitialize per cpu bases on hotplug timers: Use deferrable base independent of base::nohz_active genirq/msi, x86/vector: Prevent reservation mode for non maskable MSI genirq/irqdomain: Rename early argument of irq_domain_activate_irq() x86/vector: Use IRQD_CAN_RESERVE flag genirq: Introduce IRQD_CAN_RESERVE flag genirq/msi: Handle reactivation only on success gpio: brcmstb: Make really use of the new lockdep class ...
Showing the changes to include/uapi/linux (2 of 806 files). Show all
Unified · Split
| @@ -256,7 +256,6 @@ struct tc_red_qopt { · 255 unmodified lines | ||
| 256 | 256 | #define TC_RED_ECN 1 |
| 257 | 257 | #define TC_RED_HARDDROP 2 |
| 258 | 258 | #define TC_RED_ADAPTATIVE 4 |
| 259 | −#define TC_RED_OFFLOADED 8 | |
| 260 | 259 | }; |
| 261 | 260 | |
| 262 | 261 | struct tc_red_xstats { |
| @@ -557,6 +557,7 @@ enum { · 556 unmodified lines | ||
| 557 | 557 | TCA_PAD, |
| 558 | 558 | TCA_DUMP_INVISIBLE, |
| 559 | 559 | TCA_CHAIN, |
| 560 | + TCA_HW_OFFLOAD, | |
| 560 | 561 | __TCA_MAX |
| 561 | 562 | }; |
| 562 | 563 | |