Re: [linux-stable-rc:linux-4.19.y 565/981] arch/xtensa/platforms/xtfpga/include/platform/hardware.h:50:33: error: initializer element is not constant

From: Max Filippov
Date: Mon Nov 29 2021 - 09:21:18 EST


Hi Greg,

On Sun, Nov 28, 2021 at 5:03 AM Greg Kroah-Hartman
<gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
> On Sat, Nov 27, 2021 at 07:10:56AM -0800, Max Filippov wrote:
> > This happens because the backported change
> > 1c21a8df144f1edb3b6f5f24559825780c227a7d depends on the change
> > d67ed2510d28 ("xtensa: use CONFIG_USE_OF instead of CONFIG_OF")
> > which is not in that stable tree.
> >
> > Should I send the backported version of the d67ed2510d28 or should
> > the change 1c21a8df144f1edb3b6f5f24559825780c227a7d be reverted
> > from the stable? (IMO they are not the stable material).
>
> I have queued up d67ed2510d28 ("xtensa: use CONFIG_USE_OF instead of
> CONFIG_OF") to hopefully resolve this.

Thank you. However the change that you've queued is missing one
hunk of the original patch that makes the difference in this case.
I guess it's missing due to conflict introduced by the change
6591685d5004 ("xtensa: move XCHAL_KIO_* definitions to kmem_layout.h")

I've posted another backported version of this patch that includes
that missing part. Could you please apply it instead?

--
Thanks.
-- Max