History

Merge 5.11-rc5 into tty-next

We need the fixes in here and this resolves a merge issue in drivers/tty/tty_io.c

Greg Kroah-Hartman committed 5 years ago

Commit 0f8b29f2 parents e71a8d5 6ee1d741126 files · +12009 −6629Browse files

Showing the changes to include/uapi (6 of 1126 files). Show all

Unified · Split

6 files
  1. include/uapi/linux/bcache.h +1 −1
  2. include/uapi/linux/if_link.h +3 −2
  3. include/uapi/linux/kvm.h +2 −0
  4. include/uapi/linux/netfilter/nf_tables.h +3 −0
  5. include/uapi/linux/ppp-ioctl.h +1 −1
  6. include/uapi/misc/habanalabs.h +5 −0
include/uapi/linux/bcache.h+1−1
@@ -213,7 +213,7 @@ struct cache_sb_disk { · 212 unmodified lines
213213 __le16 keys;
214214 };
215215 __le64 d[SB_JOURNAL_BUCKETS]; /* journal buckets */
216− __le16 bucket_size_hi;
216+ __le16 obso_bucket_size_hi; /* obsoleted */
217217 };
218218
219219 /*
include/uapi/linux/if_link.h+3−2
@@ -75,8 +75,9 @@ struct rtnl_link_stats { · 74 unmodified lines
7575 *
7676 * @rx_dropped: Number of packets received but not processed,
7777 * e.g. due to lack of resources or unsupported protocol.
78− * For hardware interfaces this counter should not include packets
79− * dropped by the device which are counted separately in
78+ * For hardware interfaces this counter may include packets discarded
79+ * due to L2 address filtering but should not include packets dropped
80+ * by the device due to buffer exhaustion which are counted separately in
8081 * @rx_missed_errors (since procfs folds those two counters together).
8182 *
8283 * @tx_dropped: Number of packets dropped on their way to transmission,
include/uapi/linux/kvm.h+2−0
@@ -251,6 +251,7 @@ struct kvm_hyperv_exit { · 250 unmodified lines
251251 #define KVM_EXIT_X86_RDMSR 29
252252 #define KVM_EXIT_X86_WRMSR 30
253253 #define KVM_EXIT_DIRTY_RING_FULL 31
254+#define KVM_EXIT_AP_RESET_HOLD 32
254255
255256 /* For KVM_EXIT_INTERNAL_ERROR */
256257 /* Emulate instruction failed. */
@@ -573,6 +574,7 @@ struct kvm_vapic_addr { · 316 unmodified lines
573574 #define KVM_MP_STATE_CHECK_STOP 6
574575 #define KVM_MP_STATE_OPERATING 7
575576 #define KVM_MP_STATE_LOAD 8
577+#define KVM_MP_STATE_AP_RESET_HOLD 9
576578
577579 struct kvm_mp_state {
578580 __u32 mp_state;
include/uapi/linux/netfilter/nf_tables.h+3−0
@@ -293,6 +293,7 @@ enum nft_rule_compat_attributes { · 292 unmodified lines
293293 * @NFT_SET_EVAL: set can be updated from the evaluation path
294294 * @NFT_SET_OBJECT: set contains stateful objects
295295 * @NFT_SET_CONCAT: set contains a concatenation
296+ * @NFT_SET_EXPR: set contains expressions
296297 */
297298 enum nft_set_flags {
298299 NFT_SET_ANONYMOUS = 0x1,
@@ -303,6 +304,7 @@ enum nft_set_flags { · 4 unmodified lines
303304 NFT_SET_EVAL = 0x20,
304305 NFT_SET_OBJECT = 0x40,
305306 NFT_SET_CONCAT = 0x80,
307+ NFT_SET_EXPR = 0x100,
306308 };
307309
308310 /**
@@ -706,6 +708,7 @@ enum nft_dynset_ops { · 397 unmodified lines
706708
707709 enum nft_dynset_flags {
708710 NFT_DYNSET_F_INV = (1 << 0),
711+ NFT_DYNSET_F_EXPR = (1 << 1),
709712 };
710713
711714 /**
include/uapi/linux/ppp-ioctl.h+1−1
@@ -116,7 +116,7 @@ struct pppol2tp_ioc_stats { · 115 unmodified lines
116116 #define PPPIOCGCHAN _IOR('t', 55, int) /* get ppp channel number */
117117 #define PPPIOCGL2TPSTATS _IOR('t', 54, struct pppol2tp_ioc_stats)
118118 #define PPPIOCBRIDGECHAN _IOW('t', 53, int) /* bridge one channel to another */
119−#define PPPIOCUNBRIDGECHAN _IO('t', 54) /* unbridge channel */
119+#define PPPIOCUNBRIDGECHAN _IO('t', 52) /* unbridge channel */
120120
121121 #define SIOCGPPPSTATS (SIOCDEVPRIVATE + 0)
122122 #define SIOCGPPPVER (SIOCDEVPRIVATE + 1) /* NEVER change this!! */
include/uapi/misc/habanalabs.h+5−0
@@ -279,6 +279,7 @@ enum hl_device_status { · 278 unmodified lines
279279 * HL_INFO_CLK_THROTTLE_REASON - Retrieve clock throttling reason
280280 * HL_INFO_SYNC_MANAGER - Retrieve sync manager info per dcore
281281 * HL_INFO_TOTAL_ENERGY - Retrieve total energy consumption
282+ * HL_INFO_PLL_FREQUENCY - Retrieve PLL frequency
282283 */
283284 #define HL_INFO_HW_IP_INFO 0
284285 #define HL_INFO_HW_EVENTS 1
@@ -425,6 +426,8 @@ struct hl_info_sync_manager { · 140 unmodified lines
425426 * @ctx_device_in_reset_drop_cnt: context dropped due to device in reset
426427 * @total_max_cs_in_flight_drop_cnt: total dropped due to maximum CS in-flight
427428 * @ctx_max_cs_in_flight_drop_cnt: context dropped due to maximum CS in-flight
429+ * @total_validation_drop_cnt: total dropped due to validation error
430+ * @ctx_validation_drop_cnt: context dropped due to validation error
428431 */
429432 struct hl_info_cs_counters {
430433 __u64 total_out_of_mem_drop_cnt;
@@ -437,6 +440,8 @@ struct hl_info_cs_counters { · 6 unmodified lines
437440 __u64 ctx_device_in_reset_drop_cnt;
438441 __u64 total_max_cs_in_flight_drop_cnt;
439442 __u64 ctx_max_cs_in_flight_drop_cnt;
443+ __u64 total_validation_drop_cnt;
444+ __u64 ctx_validation_drop_cnt;
440445 };
441446
442447 enum gaudi_dcores {