From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Mar 2020 22:49:09 +0000 (-0700)
Subject: Merge tag 'arc-5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
X-Git-Tag: v5.15~4322
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3086ae071686e0fff1c0006a635f101edc5f3540;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'arc-5.6-rc6' of git://git./linux/kernel/git/vgupta/arc

Pull ARC fixes from Vineet Gupta:

 - Fix __ALIGN_STR and __ALIGN to not use default junk padding

 - Misc Kconfig cleanups, header updates

* tag 'arc-5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: define __ALIGN_STR and __ALIGN symbols for ARC
  ARC: show_regs: reduce lines of output
  ARC: Replace <linux/clk-provider.h> by <linux/of_clk.h>
  ARC: fpu: fix randconfig build error reported by 0-day test service
  ARC: fix some Kconfig typos
  ARC: Cleanup old Kconfig IO scheduler options
---

3086ae071686e0fff1c0006a635f101edc5f3540