Merge b4.19-rc4 into char-misc-next

We want the bugfixes in here as well.

Greg Kroah-Hartman committed 8 years ago

Commit f685fc62 parents 7adb05b 7876320300 files · +2985 −1737Browse files

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

Unified · Split

@@ -144,7 +144,7 @@ enum perf_event_sample_format { · 143 unmodified lines
144	144
145	145	PERF_SAMPLE_MAX = 1U << 20, /* non-ABI */
146	146
147		− __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63,
	147	+ __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */
148	148	};
149	149
150	150	/*

Keyboard shortcuts