History

Merge 4.15-rc6 into char-misc-next

We want the fixes in here as well.

Greg Kroah-Hartman committed 8 years ago

Commit b6a09412 parents db80985 30a7acd806 files · +9728 −5643Browse files

Showing the changes to include/uapi/linux (2 of 806 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/pkt_sched.h +0 −1
  2. include/uapi/linux/rtnetlink.h +1 −0
include/uapi/linux/pkt_sched.h+0−1
@@ -256,7 +256,6 @@ struct tc_red_qopt { · 255 unmodified lines
256#define TC_RED_ECN 1256#define TC_RED_ECN 1
257#define TC_RED_HARDDROP 2257#define TC_RED_HARDDROP 2
258#define TC_RED_ADAPTATIVE 4258#define TC_RED_ADAPTATIVE 4
259#define TC_RED_OFFLOADED 8
260};259};
261 260
262struct tc_red_xstats {261struct tc_red_xstats {
include/uapi/linux/rtnetlink.h+1−0
@@ -557,6 +557,7 @@ enum { · 556 unmodified lines
557 TCA_PAD,557 TCA_PAD,
558 TCA_DUMP_INVISIBLE,558 TCA_DUMP_INVISIBLE,
559 TCA_CHAIN,559 TCA_CHAIN,
560 TCA_HW_OFFLOAD,
560 __TCA_MAX561 __TCA_MAX
561};562};
562 563