FAILED: patch "[PATCH] x86/vdso: Fix 'make bzImage' on older distros" failed to apply to 4.0-stable tree

FAILED: patch "[PATCH] x86/vdso: Fix 'make bzImage' on older distros" failed to apply to 4.0-stable tree

[gregkh]

The patch below does not apply to the 4.0-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

>From ef7254a595912b026d80a4116b8c4cd5b79d9c62 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Mon, 11 May 2015 10:15:50 +0200
Subject: [PATCH] x86/vdso: Fix 'make bzImage' on older distros

Change HOST_EXTRACFLAGS to include arch/x86/include/uapi along
with include/uapi.

This looks more consistent, and this fixes "make bzImage" on my
old distro which doesn't have asm/bitsperlong.h in /usr/include/.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Andy Lutomirski <luto@kernel.org>
Cc: <stable@vger.kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 6f121e548f83 ("x86, vdso: Reimplement vdso.so preparation in build-time C")
Link: http://lkml.kernel.org/r/1431332153-18566-6-git-send-email-bp@alien8.de
Link: http://lkml.kernel.org/r/20150507165835.GB18652@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
index 275a3a8b78af..e97032069f88 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@@ -51,7 +51,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
 $(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
 	$(call if_changed,vdso)
 
-HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi
+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/x86/include/uapi
 hostprogs-y			+= vdso2c
 
 quiet_cmd_vdso2c = VDSO2C  $@

Re: FAILED: patch "[PATCH] x86/vdso: Fix 'make bzImage' on older distros" failed to apply to 4.0-stable tree

[Andy Lutomirski]

On Tue, Jun 2, 2015 at 10:20 PM,  <gregkh@linuxfoundation.org> wrote:
>
> The patch below does not apply to the 4.0-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.

It should apply if 0a4f59d6e09ef16fbb7d213cfa1bf472c7845fda backported
as well.  Given that both are straightforward build fixes, they are
probably reasonable to backport together.

--Andy

Re: FAILED: patch "[PATCH] x86/vdso: Fix 'make bzImage' on older distros" failed to apply to 4.0-stable tree

[Greg KH]

On Fri, Jun 12, 2015 at 04:31:43PM -0700, Andy Lutomirski wrote:
> On Tue, Jun 2, 2015 at 10:20 PM,  <gregkh@linuxfoundation.org> wrote:
> >
> > The patch below does not apply to the 4.0-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
> 
> It should apply if 0a4f59d6e09ef16fbb7d213cfa1bf472c7845fda backported
> as well.  Given that both are straightforward build fixes, they are
> probably reasonable to backport together.

Thanks, that worked.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe stable" in