History

Merge 6.5-rc6 into usb-next

We need the USB and Thunderbolt fixes in here to build on.

Greg Kroah-Hartman committed 3 years ago

Commit bbb9e062 parents 55c3e57 2ccdd1b606 files · +6079 −2924Browse files

Showing the changes to include/uapi (1 of 606 files). Show all

Unified · Split

include/uapi/linux/pkt_cls.h+3−1
@@ -710,9 +710,11 @@ enum { · 709 unmodified lines
710710 TCA_FLOWER_KEY_CFM_OPT_UNSPEC,
711711 TCA_FLOWER_KEY_CFM_MD_LEVEL,
712712 TCA_FLOWER_KEY_CFM_OPCODE,
713− TCA_FLOWER_KEY_CFM_OPT_MAX,
713+ __TCA_FLOWER_KEY_CFM_OPT_MAX,
714714 };
715715
716+#define TCA_FLOWER_KEY_CFM_OPT_MAX (__TCA_FLOWER_KEY_CFM_OPT_MAX - 1)
717+
716718 #define TCA_FLOWER_MASK_FLAGS_RANGE (1 << 0) /* Range-based match */
717719
718720 /* Match-all classifier */

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