Merge branch 'sched/urgent' into sched/core, to resolve conflicts
This commit in sched/urgent moved the cfs_rq_is_decayed() function:a7b359fc6a: ("sched/fair: Correctly insert cfs_rq's to list on unthrottle") and this fresh commit in sched/core modified it in the old location:9e077b52d8: ("sched/pelt: Check that *_avg are null when *_sum are") Merge the two variants. Conflicts: kernel/sched/fair.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
+1
-1
@@ -37,7 +37,7 @@ MODULE_LICENSE("GPL v2");
|
||||
/**
|
||||
* crc64_be - Calculate bitwise big-endian ECMA-182 CRC64
|
||||
* @crc: seed value for computation. 0 or (u64)~0 for a new CRC calculation,
|
||||
or the previous crc64 value if computing incrementally.
|
||||
* or the previous crc64 value if computing incrementally.
|
||||
* @p: pointer to buffer over which CRC64 is run
|
||||
* @len: length of buffer @p
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user