From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 Oct 2020 18:25:16 +0000 (-0700)
Subject: Merge tag 'sched-urgent-2020-10-25' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~2554
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87702a337f748d19a59a7826aeeffe0f6aeab7d4;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'sched-urgent-2020-10-25' of git://git./linux/kernel/git/tip/tip

Pull scheduler fixes from Thomas Gleixner:
 "Two scheduler fixes:

   - A trivial build fix for sched_feat() to compile correctly with
     CONFIG_JUMP_LABEL=n

   - Replace a zero lenght array with a flexible array"

* tag 'sched-urgent-2020-10-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/features: Fix !CONFIG_JUMP_LABEL case
  sched: Replace zero-length array with flexible-array
---

87702a337f748d19a59a7826aeeffe0f6aeab7d4