Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Jakub Kicinski committed 5 years ago

Commit 1d9f03c2 parents e4abfd8 1466205397 files · +3926 −2622Browse files

Showing the changes to include/uapi (3 of 397 files). Show all

Unified · Split

3 files

@@ -213,7 +213,7 @@ struct cache_sb_disk { · 212 unmodified lines
213	213	__le16 keys;
214	214	};
215	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	/*

@@ -251,6 +251,7 @@ struct kvm_hyperv_exit { · 250 unmodified lines
251	251	#define KVM_EXIT_X86_RDMSR 29
252	252	#define KVM_EXIT_X86_WRMSR 30
253	253	#define KVM_EXIT_DIRTY_RING_FULL 31
	254	+#define KVM_EXIT_AP_RESET_HOLD 32
254	255
255	256	/* For KVM_EXIT_INTERNAL_ERROR */
256	257	/* Emulate instruction failed. */
@@ -573,6 +574,7 @@ struct kvm_vapic_addr { · 316 unmodified lines
573	574	#define KVM_MP_STATE_CHECK_STOP 6
574	575	#define KVM_MP_STATE_OPERATING 7
575	576	#define KVM_MP_STATE_LOAD 8
	577	+#define KVM_MP_STATE_AP_RESET_HOLD 9
576	578
577	579	struct kvm_mp_state {
578	580	__u32 mp_state;

@@ -279,6 +279,7 @@ enum hl_device_status { · 278 unmodified lines
279	279	* HL_INFO_CLK_THROTTLE_REASON - Retrieve clock throttling reason
280	280	* HL_INFO_SYNC_MANAGER - Retrieve sync manager info per dcore
281	281	* HL_INFO_TOTAL_ENERGY - Retrieve total energy consumption
	282	+ * HL_INFO_PLL_FREQUENCY - Retrieve PLL frequency
282	283	*/
283	284	#define HL_INFO_HW_IP_INFO 0
284	285	#define HL_INFO_HW_EVENTS 1
@@ -425,6 +426,8 @@ struct hl_info_sync_manager { · 140 unmodified lines
425	426	* @ctx_device_in_reset_drop_cnt: context dropped due to device in reset
426	427	* @total_max_cs_in_flight_drop_cnt: total dropped due to maximum CS in-flight
427	428	* @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
428	431	*/
429	432	struct hl_info_cs_counters {
430	433	__u64 total_out_of_mem_drop_cnt;
@@ -437,6 +440,8 @@ struct hl_info_cs_counters { · 6 unmodified lines
437	440	__u64 ctx_device_in_reset_drop_cnt;
438	441	__u64 total_max_cs_in_flight_drop_cnt;
439	442	__u64 ctx_max_cs_in_flight_drop_cnt;
	443	+ __u64 total_validation_drop_cnt;
	444	+ __u64 ctx_validation_drop_cnt;
440	445	};
441	446
442	447	enum gaudi_dcores {

Keyboard shortcuts