Re: [memcg:since-4.6 827/827] arch/s390/include/asm/jump_label.h:17:32: error: expected ':' before '__stringify'

Michal Hocko
2016-07-14T07:19:18Z

On Wed 13-07-16 14:16:11, Jason Baron wrote:
> On 07/13/2016 02:05 PM, Andrew Morton wrote:
> > On Wed, 13 Jul 2016 13:43:44 -0400 Jason Baron <jbaron@akamai.com> wrote:
> >
> >> This is likely due to the fact that the s390 bits
> >> bits were not pulled into -mm here:
> >>
> >> http://lkml.iu.edu/hypermail/linux/kernel/1607.0/03114.html
> >>
> >> However, I do see them in linux-next, I think from
> >> the s390 tree. So perhaps, that patch can be pulled
> >> in here as well?
> >
> > Yup, I have
> > jump_label-remove-bugh-atomich-dependencies-for-have_jump_label.patch
> > staged after linux-next and it has that dependency on linux-next.
> >
>
> ok, you have the dependency correct, thanks.
>
> That dependency though is not being honored in the referenced
> mm tree branch 'since-4.6', since the relevant s390 patch
> is not present. So, if we want to fix it here, we need
> that patch...

My fault. I haven't noticed this patch. I usually apply everything that
is in appropriate sections of series file and then fix up compilation
issues. I didn't do my allarch build test the last time due to lack of
time so I haven't noticed this. Sorry about that!

That being said, I have cherry-picked the s390 part.
--
Michal Hocko
SUSE Labs