linux-next: manual merge of the kbuild tree with Linus' tree

Hi all, Today's linux-next merge of the kbuild tree got a conflict in: arch/mips/kernel/syscalls/Makefile between commit: ccb21774863a ("MIPS: UAPI: unexport unistd_nr_{n32,n64,o32}.h") from Linus' tree and commit: 865fa29f7dd1 ("arch: syscalls: add missing FORCE and fix 'targets' to

linux-next: manual merge of the kbuild tree with Linus' tree

Hi all, Today's linux-next merge of the kbuild tree got a conflict in: arch/mips/lasat/image/Makefile between commit: 10760dde9be3 ("MIPS: Remove support for LASAT") from Linus' tree and commit: 1312a1e434c1 ("kbuild: add variables for compression tools") from the kbuild tree. I

linux-next: manual merge of the kbuild tree with Linus' tree

Hi all, Today's linux-next merge of the kbuild tree got a conflict in: Makefile between commit: 6f303d60534c ("gcc-9: silence 'address-of-packed-member' warning") from Linus' tree and commit: c21e4135d629 ("kbuild: re-enable int-in-bool-context warning") from the kbuild tree. I fixed

linux-next: manual merge of the kbuild tree with Linus' tree

Hi Masahiro, Today's linux-next merge of the kbuild tree got a conflict in: arch/avr32/include/uapi/asm/Kbuild between commit: 26202873bb51 ("avr32: remove support for AVR32 architecture") from Linus' tree and commit: 65017bab8a9e ("uapi: export all headers under uapi directories")

linux-next: manual merge of the kbuild tree with Linus' tree

Hi Masahiro, Today's linux-next merge of the kbuild tree got a conflict in: arch/avr32/include/uapi/asm/Kbuild between commit: 26202873bb51 ("avr32: remove support for AVR32 architecture") from Linus' tree and commit: 65017bab8a9e ("uapi: export all headers under uapi directories")

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On Tue, 13 Sep 2016 09:48:03 +0200 Arnd Bergmann wrote: > On Tuesday, September 13, 2016 2:02:57 PM CEST Stephen Rothwell wrote: > > [For the new cc's, we are discussing the "thin archives" and "link dead > > code/data elimination" patches in the kbuild tree.] > > > > On Tue, 13

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On Tue, 13 Sep 2016 09:48:03 +0200 Arnd Bergmann wrote: > On Tuesday, September 13, 2016 2:02:57 PM CEST Stephen Rothwell wrote: > > [For the new cc's, we are discussing the "thin archives" and "link dead > > code/data elimination" patches in the kbuild tree.] > > > > On Tue, 13 Sep 2016

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On Tuesday, September 13, 2016 2:02:57 PM CEST Stephen Rothwell wrote: > [For the new cc's, we are discussing the "thin archives" and "link dead > code/data elimination" patches in the kbuild tree.] > > On Tue, 13 Sep 2016 09:39:45 +1000 Stephen Rothwell > wrote: > > > >

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On Tuesday, September 13, 2016 2:02:57 PM CEST Stephen Rothwell wrote: > [For the new cc's, we are discussing the "thin archives" and "link dead > code/data elimination" patches in the kbuild tree.] > > On Tue, 13 Sep 2016 09:39:45 +1000 Stephen Rothwell > wrote: > > > > On Mon, 12 Sep 2016

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On Tue, 13 Sep 2016 14:02:57 +1000 Stephen Rothwell wrote: > Hi Michal, > > [For the new cc's, we are discussing the "thin archives" and "link dead > code/data elimination" patches in the kbuild tree.] > > On Tue, 13 Sep 2016 09:39:45 +1000 Stephen Rothwell

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On Tue, 13 Sep 2016 14:02:57 +1000 Stephen Rothwell wrote: > Hi Michal, > > [For the new cc's, we are discussing the "thin archives" and "link dead > code/data elimination" patches in the kbuild tree.] > > On Tue, 13 Sep 2016 09:39:45 +1000 Stephen Rothwell > wrote: > > > > On Mon, 12 Sep

Re: linux-next: manual merge of the kbuild tree with Linus' tree

Hi Michal, [For the new cc's, we are discussing the "thin archives" and "link dead code/data elimination" patches in the kbuild tree.] On Tue, 13 Sep 2016 09:39:45 +1000 Stephen Rothwell wrote: > > On Mon, 12 Sep 2016 11:03:08 +0200 Michal Marek wrote: >

Re: linux-next: manual merge of the kbuild tree with Linus' tree

Hi Michal, [For the new cc's, we are discussing the "thin archives" and "link dead code/data elimination" patches in the kbuild tree.] On Tue, 13 Sep 2016 09:39:45 +1000 Stephen Rothwell wrote: > > On Mon, 12 Sep 2016 11:03:08 +0200 Michal Marek wrote: > > > > On 2016-09-12 04:53, Nicholas

Re: linux-next: manual merge of the kbuild tree with Linus' tree

Hi Michal, On Mon, 12 Sep 2016 11:03:08 +0200 Michal Marek wrote: > > On 2016-09-12 04:53, Nicholas Piggin wrote: > > Question, what is the best way to merge dependent patches? Considering > > they will need a good amount of architecture testing, I think they will > > have to go

Re: linux-next: manual merge of the kbuild tree with Linus' tree

Hi Michal, On Mon, 12 Sep 2016 11:03:08 +0200 Michal Marek wrote: > > On 2016-09-12 04:53, Nicholas Piggin wrote: > > Question, what is the best way to merge dependent patches? Considering > > they will need a good amount of architecture testing, I think they will > > have to go via arch trees.

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On 2016-09-12 04:53, Nicholas Piggin wrote: > Question, what is the best way to merge dependent patches? Considering > they will need a good amount of architecture testing, I think they will > have to go via arch trees. But it also does not make sense to merge these > kbuild changes upstream

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On 2016-09-12 04:53, Nicholas Piggin wrote: > Question, what is the best way to merge dependent patches? Considering > they will need a good amount of architecture testing, I think they will > have to go via arch trees. But it also does not make sense to merge these > kbuild changes upstream

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On Mon, 12 Sep 2016 11:32:24 +1000 Stephen Rothwell wrote: > Hi Michal, > > Today's linux-next merge of the kbuild tree got a conflict in: > > arch/Kconfig > > between commit: > > 0f60a8efe400 ("mm: Implement stack frame object validation") > > from Linus' tree

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On Mon, 12 Sep 2016 11:32:24 +1000 Stephen Rothwell wrote: > Hi Michal, > > Today's linux-next merge of the kbuild tree got a conflict in: > > arch/Kconfig > > between commit: > > 0f60a8efe400 ("mm: Implement stack frame object validation") > > from Linus' tree and commits: > >

linux-next: manual merge of the kbuild tree with Linus' tree

Hi Michal, Today's linux-next merge of the kbuild tree got a conflict in: arch/Kconfig between commit: 0f60a8efe400 ("mm: Implement stack frame object validation") from Linus' tree and commits: a5967db9af51 ("kbuild: allow architectures to use thin archives instead of ld -r")

linux-next: manual merge of the kbuild tree with Linus' tree

Hi Michal, Today's linux-next merge of the kbuild tree got a conflict in: arch/Kconfig between commit: 0f60a8efe400 ("mm: Implement stack frame object validation") from Linus' tree and commits: a5967db9af51 ("kbuild: allow architectures to use thin archives instead of ld -r")

linux-next: manual merge of the kbuild tree with Linus' tree

Hi Michal, Today's linux-next merge of the kbuild tree got a conflict in: Makefile between commits: 6e8d666e9253 ("Disable "maybe-uninitialized" warning globally") from Linus' tree and commits: 543c37cb1650 ("Add sancov plugin") from the kbuild tree. I fixed it up (see below) and can

linux-next: manual merge of the kbuild tree with Linus' tree

Hi Michal, Today's linux-next merge of the kbuild tree got a conflict in: Makefile between commits: 6e8d666e9253 ("Disable "maybe-uninitialized" warning globally") from Linus' tree and commits: 543c37cb1650 ("Add sancov plugin") from the kbuild tree. I fixed it up (see below) and can

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On Thu, Jul 2, 2015 at 9:53 PM, Michal Marek wrote: > Dne 2.7.2015 v 11:18 Geert Uytterhoeven napsal(a): >> On Thu, Jul 2, 2015 at 9:17 AM, Michal Marek wrote: >>> Dne 2.7.2015 v 08:47 Geert Uytterhoeven napsal(a): On Thu, Jul 2, 2015 at 2:30 AM, Stephen Rothwell wrote: > diff

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On Thu, Jul 2, 2015 at 9:53 PM, Michal Marek mma...@suse.cz wrote: Dne 2.7.2015 v 11:18 Geert Uytterhoeven napsal(a): On Thu, Jul 2, 2015 at 9:17 AM, Michal Marek mma...@suse.cz wrote: Dne 2.7.2015 v 08:47 Geert Uytterhoeven napsal(a): On Thu, Jul 2, 2015 at 2:30 AM, Stephen Rothwell

Re: linux-next: manual merge of the kbuild tree with Linus' tree

Dne 2.7.2015 v 11:18 Geert Uytterhoeven napsal(a): > On Thu, Jul 2, 2015 at 9:17 AM, Michal Marek wrote: >> Dne 2.7.2015 v 08:47 Geert Uytterhoeven napsal(a): >>> On Thu, Jul 2, 2015 at 2:30 AM, Stephen Rothwell >>> wrote: diff --cc scripts/kconfig/Makefile index

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On Thu, Jul 2, 2015 at 9:17 AM, Michal Marek wrote: > Dne 2.7.2015 v 08:47 Geert Uytterhoeven napsal(a): >> On Thu, Jul 2, 2015 at 2:30 AM, Stephen Rothwell >> wrote: >>> Today's linux-next merge of the kbuild tree got a conflict in: >>> >>> scripts/kconfig/Makefile >>> >>> between commits:

Re: linux-next: manual merge of the kbuild tree with Linus' tree

Dne 2.7.2015 v 08:47 Geert Uytterhoeven napsal(a): > On Thu, Jul 2, 2015 at 2:30 AM, Stephen Rothwell > wrote: >> Today's linux-next merge of the kbuild tree got a conflict in: >> >> scripts/kconfig/Makefile >> >> between commits: >> >> 9bcd776d299e ("kconfig: clarify kvmconfig is for kvm")

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On Thu, Jul 2, 2015 at 2:30 AM, Stephen Rothwell wrote: > Today's linux-next merge of the kbuild tree got a conflict in: > > scripts/kconfig/Makefile > > between commits: > > 9bcd776d299e ("kconfig: clarify kvmconfig is for kvm") > 6c6685055a28 ("kconfig: add xenconfig defconfig helper") >

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On Thu, Jul 2, 2015 at 2:30 AM, Stephen Rothwell s...@canb.auug.org.au wrote: Today's linux-next merge of the kbuild tree got a conflict in: scripts/kconfig/Makefile between commits: 9bcd776d299e (kconfig: clarify kvmconfig is for kvm) 6c6685055a28 (kconfig: add xenconfig defconfig

Re: linux-next: manual merge of the kbuild tree with Linus' tree

Dne 2.7.2015 v 08:47 Geert Uytterhoeven napsal(a): On Thu, Jul 2, 2015 at 2:30 AM, Stephen Rothwell s...@canb.auug.org.au wrote: Today's linux-next merge of the kbuild tree got a conflict in: scripts/kconfig/Makefile between commits: 9bcd776d299e (kconfig: clarify kvmconfig is for

Re: linux-next: manual merge of the kbuild tree with Linus' tree

On Thu, Jul 2, 2015 at 9:17 AM, Michal Marek mma...@suse.cz wrote: Dne 2.7.2015 v 08:47 Geert Uytterhoeven napsal(a): On Thu, Jul 2, 2015 at 2:30 AM, Stephen Rothwell s...@canb.auug.org.au wrote: Today's linux-next merge of the kbuild tree got a conflict in: scripts/kconfig/Makefile

Re: linux-next: manual merge of the kbuild tree with Linus' tree

Dne 2.7.2015 v 11:18 Geert Uytterhoeven napsal(a): On Thu, Jul 2, 2015 at 9:17 AM, Michal Marek mma...@suse.cz wrote: Dne 2.7.2015 v 08:47 Geert Uytterhoeven napsal(a): On Thu, Jul 2, 2015 at 2:30 AM, Stephen Rothwell s...@canb.auug.org.au wrote: diff --cc scripts/kconfig/Makefile index

linux-next: manual merge of the kbuild tree with Linus' tree

Hi Michal, Today's linux-next merge of the kbuild tree got a conflict in: scripts/kconfig/Makefile between commits: 9bcd776d299e ("kconfig: clarify kvmconfig is for kvm") 6c6685055a28 ("kconfig: add xenconfig defconfig helper") from Linus' tree and commit: fa75a727c019 ("kconfig:

linux-next: manual merge of the kbuild tree with Linus' tree

Hi Michal, Today's linux-next merge of the kbuild tree got a conflict in: scripts/kconfig/Makefile between commits: 9bcd776d299e (kconfig: clarify kvmconfig is for kvm) 6c6685055a28 (kconfig: add xenconfig defconfig helper) from Linus' tree and commit: fa75a727c019 (kconfig: Wrap