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

@@ -213,7 +213,7 @@ struct cache_sb_disk { · 212 unmodified lines
213	__le16 keys;	213	__le16 keys;
214	};	214	};
215	__le64 d[SB_JOURNAL_BUCKETS]; /* journal buckets */	215	__le64 d[SB_JOURNAL_BUCKETS]; /* journal buckets */
216	__le16 bucket_size_hi;	216	__le16 obso_bucket_size_hi; /* obsoleted */
217	};	217	};
218		218
219	/*	219	/*

  *
  * @rx_dropped: Number of packets received but not processed,
  *   e.g. due to lack of resources or unsupported protocol.
- *   For hardware interfaces this counter should not include packets
+ *   For hardware interfaces this counter may include packets discarded
- *   dropped by the device which are counted separately in
+ *   due to L2 address filtering but should not include packets dropped
+ *   by the device due to buffer exhaustion which are counted separately in
  *   @rx_missed_errors (since procfs folds those two counters together).
  *
  * @tx_dropped: Number of packets dropped on their way to transmission,

 #define KVM_EXIT_X86_RDMSR        29
 #define KVM_EXIT_X86_WRMSR        30
 #define KVM_EXIT_DIRTY_RING_FULL  31
+#define KVM_EXIT_AP_RESET_HOLD    32
 /* For KVM_EXIT_INTERNAL_ERROR */
 /* Emulate instruction failed. */
 #define KVM_MP_STATE_CHECK_STOP        6
 #define KVM_MP_STATE_OPERATING         7
 #define KVM_MP_STATE_LOAD              8
+#define KVM_MP_STATE_AP_RESET_HOLD     9
 struct kvm_mp_state {
 	__u32 mp_state;

  * @NFT_SET_EVAL: set can be updated from the evaluation path
  * @NFT_SET_OBJECT: set contains stateful objects
  * @NFT_SET_CONCAT: set contains a concatenation
+ * @NFT_SET_EXPR: set contains expressions
  */
 enum nft_set_flags {
 	NFT_SET_ANONYMOUS		= 0x1,
 	NFT_SET_EVAL			= 0x20,
 	NFT_SET_OBJECT			= 0x40,
 	NFT_SET_CONCAT			= 0x80,
+	NFT_SET_EXPR			= 0x100,
 };
 /**
 enum nft_dynset_flags {
 	NFT_DYNSET_F_INV	= (1 << 0),
+	NFT_DYNSET_F_EXPR	= (1 << 1),
 };
 /**

@@ -116,7 +116,7 @@ struct pppol2tp_ioc_stats { · 115 unmodified lines
116	#define PPPIOCGCHAN _IOR('t', 55, int) /* get ppp channel number */	116	#define PPPIOCGCHAN _IOR('t', 55, int) /* get ppp channel number */
117	#define PPPIOCGL2TPSTATS _IOR('t', 54, struct pppol2tp_ioc_stats)	117	#define PPPIOCGL2TPSTATS _IOR('t', 54, struct pppol2tp_ioc_stats)
118	#define PPPIOCBRIDGECHAN _IOW('t', 53, int) /* bridge one channel to another */	118	#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 */
120		120
121	#define SIOCGPPPSTATS (SIOCDEVPRIVATE + 0)	121	#define SIOCGPPPSTATS (SIOCDEVPRIVATE + 0)
122	#define SIOCGPPPVER (SIOCDEVPRIVATE + 1) /* NEVER change this!! */	122	#define SIOCGPPPVER (SIOCDEVPRIVATE + 1) /* NEVER change this!! */

  * HL_INFO_CLK_THROTTLE_REASON - Retrieve clock throttling reason
  * HL_INFO_SYNC_MANAGER  - Retrieve sync manager info per dcore
  * HL_INFO_TOTAL_ENERGY  - Retrieve total energy consumption
+ * HL_INFO_PLL_FREQUENCY - Retrieve PLL frequency
  */
 #define HL_INFO_HW_IP_INFO		0
 #define HL_INFO_HW_EVENTS		1
  * @ctx_device_in_reset_drop_cnt: context dropped due to device in reset
  * @total_max_cs_in_flight_drop_cnt: total dropped due to maximum CS in-flight
  * @ctx_max_cs_in_flight_drop_cnt: context dropped due to maximum CS in-flight
+ * @total_validation_drop_cnt: total dropped due to validation error
+ * @ctx_validation_drop_cnt: context dropped due to validation error
  */
 struct hl_info_cs_counters {
 	__u64 total_out_of_mem_drop_cnt;
 	__u64 ctx_device_in_reset_drop_cnt;
 	__u64 total_max_cs_in_flight_drop_cnt;
 	__u64 ctx_max_cs_in_flight_drop_cnt;
+	__u64 total_validation_drop_cnt;
+	__u64 ctx_validation_drop_cnt;
 };
 enum gaudi_dcores {