Merge branch 'for-5.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Nov 2020 16:57:19 +0000 (08:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Nov 2020 16:57:19 +0000 (08:57 -0800)
Pull percpu fix and cleanup from Dennis Zhou:
 "A fix for a Wshadow warning in the asm-generic percpu macros came in
  and then I tacked on the removal of flexible array initializers in the
  percpu allocator"

* 'for-5.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu:
  percpu: convert flexible array initializers to use struct_size()
  asm-generic: percpu: avoid Wshadow warning


Trivial merge