* Patch "tools/objtool/Makefile: don't assume sync-check.sh is executable" has been added to the 4.14-stable tree
@ 2018-01-17 10:02 gregkh
2018-01-17 23:07 ` Andrew Morton
0 siblings, 1 reply; 5+ messages in thread
From: gregkh @ 2018-01-17 10:02 UTC (permalink / raw)
To: akpm, Joakim.Tjernlund, gregkh, holger, jpoimboe, mingo,
nicolasbock, torvalds
Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
tools/objtool/Makefile: don't assume sync-check.sh is executable
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 12 Jan 2018 16:53:17 -0800
Subject: tools/objtool/Makefile: don't assume sync-check.sh is executable
From: Andrew Morton <akpm@linux-foundation.org>
commit 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 upstream.
patch(1) loses the x bit. So if a user follows our patching
instructions in Documentation/admin-guide/README.rst, their kernel will
not compile.
Fixes: 3bd51c5a371de ("objtool: Move kernel headers/code sync check to a script")
Reported-by: Nicolas Bock <nicolasbock@gentoo.org>
Reported-by Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Holger Hoffstätte <holger@applied-asynchrony.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
tools/objtool/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
@@ -46,7 +46,7 @@ $(OBJTOOL_IN): fixdep FORCE
@$(MAKE) $(build)=objtool
$(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN)
- @./sync-check.sh
+ @$(CONFIG_SHELL) ./sync-check.sh
$(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@
Patches currently in stable-queue which might be from akpm@linux-foundation.org are
queue-4.14/tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Patch "tools/objtool/Makefile: don't assume sync-check.sh is executable" has been added to the 4.14-stable tree
2018-01-17 10:02 Patch "tools/objtool/Makefile: don't assume sync-check.sh is executable" has been added to the 4.14-stable tree gregkh
@ 2018-01-17 23:07 ` Andrew Morton
2018-01-17 23:44 ` Holger Hoffstätte
2018-01-18 7:34 ` Greg KH
0 siblings, 2 replies; 5+ messages in thread
From: Andrew Morton @ 2018-01-17 23:07 UTC (permalink / raw)
To: gregkh
Cc: Joakim.Tjernlund, holger, jpoimboe, mingo, nicolasbock, torvalds,
stable, stable-commits
On Wed, 17 Jan 2018 11:02:12 +0100 <gregkh@linuxfoundation.org> wrote:
>
> This is a note to let you know that I've just added the patch titled
>
> tools/objtool/Makefile: don't assume sync-check.sh is executable
>
> to the 4.14-stable tree which can be found at:
> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>
> The filename of the patch is:
> tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch
> and it can be found in the queue-4.14 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.
>
>
> >From 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 Mon Sep 17 00:00:00 2001
> From: Andrew Morton <akpm@linux-foundation.org>
> Date: Fri, 12 Jan 2018 16:53:17 -0800
> Subject: tools/objtool/Makefile: don't assume sync-check.sh is executable
>
> From: Andrew Morton <akpm@linux-foundation.org>
>
> commit 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 upstream.
>
> patch(1) loses the x bit. So if a user follows our patching
> instructions in Documentation/admin-guide/README.rst, their kernel will
> not compile.
>
> Fixes: 3bd51c5a371de ("objtool: Move kernel headers/code sync check to a script")
> Reported-by: Nicolas Bock <nicolasbock@gentoo.org>
> Reported-by Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Josh Poimboeuf <jpoimboe@redhat.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: Holger Hoffst�tte <holger@applied-asynchrony.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
I'm curious. 3bd51c5a371de wasn't marked for any -stable so why is its
fix being merged?
> ---
> tools/objtool/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- a/tools/objtool/Makefile
> +++ b/tools/objtool/Makefile
> @@ -46,7 +46,7 @@ $(OBJTOOL_IN): fixdep FORCE
> @$(MAKE) $(build)=objtool
>
> $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN)
> - @./sync-check.sh
> + @$(CONFIG_SHELL) ./sync-check.sh
> $(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Patch "tools/objtool/Makefile: don't assume sync-check.sh is executable" has been added to the 4.14-stable tree
2018-01-17 23:07 ` Andrew Morton
@ 2018-01-17 23:44 ` Holger Hoffstätte
2018-01-17 23:51 ` Holger Hoffstätte
2018-01-18 7:34 ` Greg KH
1 sibling, 1 reply; 5+ messages in thread
From: Holger Hoffstätte @ 2018-01-17 23:44 UTC (permalink / raw)
To: Andrew Morton, gregkh
Cc: Joakim.Tjernlund, jpoimboe, mingo, nicolasbock, torvalds, stable,
stable-commits
On 01/18/18 00:07, Andrew Morton wrote:
> On Wed, 17 Jan 2018 11:02:12 +0100 <gregkh@linuxfoundation.org> wrote:
>
>>
>> This is a note to let you know that I've just added the patch titled
>>
>> tools/objtool/Makefile: don't assume sync-check.sh is executable
>>
>> to the 4.14-stable tree which can be found at:
>> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>>
>> The filename of the patch is:
>> tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch
>> and it can be found in the queue-4.14 subdirectory.
>>
>> If you, or anyone else, feels it should not be added to the stable tree,
>> please let <stable@vger.kernel.org> know about it.
>>
>>
>> >From 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 Mon Sep 17 00:00:00 2001
>> From: Andrew Morton <akpm@linux-foundation.org>
>> Date: Fri, 12 Jan 2018 16:53:17 -0800
>> Subject: tools/objtool/Makefile: don't assume sync-check.sh is executable
>>
>> From: Andrew Morton <akpm@linux-foundation.org>
>>
>> commit 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 upstream.
>>
>> patch(1) loses the x bit. So if a user follows our patching
>> instructions in Documentation/admin-guide/README.rst, their kernel will
>> not compile.
>>
>> Fixes: 3bd51c5a371de ("objtool: Move kernel headers/code sync check to a script")
>> Reported-by: Nicolas Bock <nicolasbock@gentoo.org>
>> Reported-by Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
>> Cc: Ingo Molnar <mingo@kernel.org>
>> Cc: Josh Poimboeuf <jpoimboe@redhat.com>
>> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
>> Cc: Holger Hoffstätte <holger@applied-asynchrony.com>
>> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> I'm curious. 3bd51c5a371de wasn't marked for any -stable so why is its
> fix being merged?
Because some people/distributions/tools download a kernel-4.14 base
image and apply a patchset to create the final version (less to download).
Using patch to assemble the final version loses the x bit and voila:
build error. This patch removes the need for the executable bit,
and everyone is happy again.
-h
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Patch "tools/objtool/Makefile: don't assume sync-check.sh is executable" has been added to the 4.14-stable tree
2018-01-17 23:44 ` Holger Hoffstätte
@ 2018-01-17 23:51 ` Holger Hoffstätte
0 siblings, 0 replies; 5+ messages in thread
From: Holger Hoffstätte @ 2018-01-17 23:51 UTC (permalink / raw)
To: Andrew Morton, gregkh
Cc: Joakim.Tjernlund, jpoimboe, mingo, nicolasbock, torvalds, stable,
stable-commits
On 01/18/18 00:44, Holger Hoffstätte wrote:
> On 01/18/18 00:07, Andrew Morton wrote:
>> On Wed, 17 Jan 2018 11:02:12 +0100 <gregkh@linuxfoundation.org> wrote:
>>
>>>
>>> This is a note to let you know that I've just added the patch titled
>>>
>>> tools/objtool/Makefile: don't assume sync-check.sh is executable
>>>
>>> to the 4.14-stable tree which can be found at:
>>> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>>>
>>> The filename of the patch is:
>>> tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch
>>> and it can be found in the queue-4.14 subdirectory.
>>>
>>> If you, or anyone else, feels it should not be added to the stable tree,
>>> please let <stable@vger.kernel.org> know about it.
>>>
>>>
>>> >From 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 Mon Sep 17 00:00:00 2001
>>> From: Andrew Morton <akpm@linux-foundation.org>
>>> Date: Fri, 12 Jan 2018 16:53:17 -0800
>>> Subject: tools/objtool/Makefile: don't assume sync-check.sh is executable
>>>
>>> From: Andrew Morton <akpm@linux-foundation.org>
>>>
>>> commit 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 upstream.
>>>
>>> patch(1) loses the x bit. So if a user follows our patching
>>> instructions in Documentation/admin-guide/README.rst, their kernel will
>>> not compile.
>>>
>>> Fixes: 3bd51c5a371de ("objtool: Move kernel headers/code sync check to a script")
>>> Reported-by: Nicolas Bock <nicolasbock@gentoo.org>
>>> Reported-by Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
>>> Cc: Ingo Molnar <mingo@kernel.org>
>>> Cc: Josh Poimboeuf <jpoimboe@redhat.com>
>>> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>>> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
>>> Cc: Holger Hoffstätte <holger@applied-asynchrony.com>
>>> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>>
>> I'm curious. 3bd51c5a371de wasn't marked for any -stable so why is its
>> fix being merged?
>
> Because some people/distributions/tools download a kernel-4.14 base
> image and apply a patchset to create the final version (less to download).
> Using patch to assemble the final version loses the x bit and voila:
> build error. This patch removes the need for the executable bit,
> and everyone is happy again.
Argh..I just realized that I explained the wrong question, sorry.
I guess the move was done simply so that any (inevitable) future patches
apply more easily.
-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Patch "tools/objtool/Makefile: don't assume sync-check.sh is executable" has been added to the 4.14-stable tree
2018-01-17 23:07 ` Andrew Morton
2018-01-17 23:44 ` Holger Hoffstätte
@ 2018-01-18 7:34 ` Greg KH
1 sibling, 0 replies; 5+ messages in thread
From: Greg KH @ 2018-01-18 7:34 UTC (permalink / raw)
To: Andrew Morton
Cc: Joakim.Tjernlund, holger, jpoimboe, mingo, nicolasbock, torvalds,
stable, stable-commits
On Wed, Jan 17, 2018 at 03:07:14PM -0800, Andrew Morton wrote:
> On Wed, 17 Jan 2018 11:02:12 +0100 <gregkh@linuxfoundation.org> wrote:
>
> >
> > This is a note to let you know that I've just added the patch titled
> >
> > tools/objtool/Makefile: don't assume sync-check.sh is executable
> >
> > to the 4.14-stable tree which can be found at:
> > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> >
> > The filename of the patch is:
> > tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch
> > and it can be found in the queue-4.14 subdirectory.
> >
> > If you, or anyone else, feels it should not be added to the stable tree,
> > please let <stable@vger.kernel.org> know about it.
> >
> >
> > >From 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 Mon Sep 17 00:00:00 2001
> > From: Andrew Morton <akpm@linux-foundation.org>
> > Date: Fri, 12 Jan 2018 16:53:17 -0800
> > Subject: tools/objtool/Makefile: don't assume sync-check.sh is executable
> >
> > From: Andrew Morton <akpm@linux-foundation.org>
> >
> > commit 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 upstream.
> >
> > patch(1) loses the x bit. So if a user follows our patching
> > instructions in Documentation/admin-guide/README.rst, their kernel will
> > not compile.
> >
> > Fixes: 3bd51c5a371de ("objtool: Move kernel headers/code sync check to a script")
> > Reported-by: Nicolas Bock <nicolasbock@gentoo.org>
> > Reported-by Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
> > Cc: Ingo Molnar <mingo@kernel.org>
> > Cc: Josh Poimboeuf <jpoimboe@redhat.com>
> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> > Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> > Cc: Holger Hoffst�tte <holger@applied-asynchrony.com>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> I'm curious. 3bd51c5a371de wasn't marked for any -stable so why is its
> fix being merged?
Because that commit is in the 4.14.10 release as part of the whole PTI
mess. Distros like Gentoo that package the kernel as a patch on top of
a clean tree break when trying to build the kernel without this commit.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-01-18 7:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-17 10:02 Patch "tools/objtool/Makefile: don't assume sync-check.sh is executable" has been added to the 4.14-stable tree gregkh
2018-01-17 23:07 ` Andrew Morton
2018-01-17 23:44 ` Holger Hoffstätte
2018-01-17 23:51 ` Holger Hoffstätte
2018-01-18 7:34 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).