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

Hi all, On Fri, 25 Sep 2020 15:25:45 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/arm/Makefile > > between commit: > > 596b0474d3d9 ("kbuild: preprocess module linker script") > > from the kbuild tree and commit: > >

linux-next: manual merge of the tip tree with the kbuild tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/arm/Makefile between commit: 596b0474d3d9 ("kbuild: preprocess module linker script") from the kbuild tree and commit: 5a17850e251a ("arm/build: Warn on orphan section placement") from the tip tree. I fixed it

linux-next: manual merge of the tip tree with the kbuild tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: Kbuild between commits: 86948e2a69de ("scripts/gdb: delay generation of gdb constants.py") f4d5577af6d3 ("kbuild: remove unimportant comments from ./Kbuild") from the kbuild tree and commit: 8d32588077bd

linux-next: manual merge of the tip tree with the kbuild tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: Makefile between commits: 65bba0423ecf ("kbuild: fix UML build error with CONFIG_GCC_PLUGINS") 059bc9fc375e ("kbuild: make 'archprepare' depend on 'scripts'") ce2fd53a10c7 ("kbuild: descend into scripts/gcc-plugins/

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

Hi all, On Mon, 6 Aug 2018 14:47:36 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got conflicts in: > > arch/arm64/Kconfig > arch/openrisc/Kconfig > > between commit: > > 1572497cb0e6 ("kconfig: include common Kconfig files from top-level > Kconfig") > >

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

Hi all, On Mon, 6 Aug 2018 14:47:36 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got conflicts in: > > arch/arm64/Kconfig > arch/openrisc/Kconfig > > between commit: > > 1572497cb0e6 ("kconfig: include common Kconfig files from top-level > Kconfig") > >

linux-next: manual merge of the tip tree with the kbuild tree

Hi all, Today's linux-next merge of the tip tree got conflicts in: arch/arm64/Kconfig arch/openrisc/Kconfig between commit: 1572497cb0e6 ("kconfig: include common Kconfig files from top-level Kconfig") from the kbuild tree and commits: 78ae2e1cd845 ("arm64: Use the new

linux-next: manual merge of the tip tree with the kbuild tree

Hi all, Today's linux-next merge of the tip tree got conflicts in: arch/arm64/Kconfig arch/openrisc/Kconfig between commit: 1572497cb0e6 ("kconfig: include common Kconfig files from top-level Kconfig") from the kbuild tree and commits: 78ae2e1cd845 ("arm64: Use the new

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

Hi Al, Since part of the tip tree has been merged into the vfs tree, this conflict also applies to the vfs tree, now. On Fri, 23 Jun 2017 13:50:17 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > >

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

Hi Al, Since part of the tip tree has been merged into the vfs tree, this conflict also applies to the vfs tree, now. On Fri, 23 Jun 2017 13:50:17 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/arm/include/uapi/asm/Kbuild

linux-next: manual merge of the tip tree with the kbuild tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/arm/include/uapi/asm/Kbuild between commit: ae3f4151737d ("kbuild: replace genhdr-y with generated-y") from the kbuild tree and commit: 6bc51cbaa9d7 ("signal: Remove non-uapi ") from the tip tree. I fixed it up

linux-next: manual merge of the tip tree with the kbuild tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/arm/include/uapi/asm/Kbuild between commit: ae3f4151737d ("kbuild: replace genhdr-y with generated-y") from the kbuild tree and commit: 6bc51cbaa9d7 ("signal: Remove non-uapi ") from the tip tree. I fixed it up

linux-next: manual merge of the tip tree with the kbuild tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/lib/memcpy_64.S arch/x86/kernel/x8664_ksyms_64.c between commit: 784d5699eddc ("x86: move exports to actual definitions") from the kbuild tree and commit: 9a6fb28a355d ("x86/mce: Improve memcpy_mcsafe()")

linux-next: manual merge of the tip tree with the kbuild tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/lib/memcpy_64.S arch/x86/kernel/x8664_ksyms_64.c between commit: 784d5699eddc ("x86: move exports to actual definitions") from the kbuild tree and commit: 9a6fb28a355d ("x86/mce: Improve memcpy_mcsafe()")

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

That is the right fix indeed. Stephen Rothwell wrote: >Hi all, > >Today's linux-next merge of the tip tree got a conflict in >kernel/timeconst.pl between commit 70730bca1331 ("kernel: Replace >timeconst.pl with a bc script") from the kbuild tree and commit >63a3f603413f ("timeconst.pl:

linux-next: manual merge of the tip tree with the kbuild tree

Hi all, Today's linux-next merge of the tip tree got a conflict in kernel/timeconst.pl between commit 70730bca1331 ("kernel: Replace timeconst.pl with a bc script") from the kbuild tree and commit 63a3f603413f ("timeconst.pl: Eliminate Perl warning") from the tip tree. I just droppped the tip

linux-next: manual merge of the tip tree with the kbuild tree

Hi all, Today's linux-next merge of the tip tree got a conflict in kernel/timeconst.pl between commit 70730bca1331 (kernel: Replace timeconst.pl with a bc script) from the kbuild tree and commit 63a3f603413f (timeconst.pl: Eliminate Perl warning) from the tip tree. I just droppped the tip tree

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

That is the right fix indeed. Stephen Rothwell s...@canb.auug.org.au wrote: Hi all, Today's linux-next merge of the tip tree got a conflict in kernel/timeconst.pl between commit 70730bca1331 (kernel: Replace timeconst.pl with a bc script) from the kbuild tree and commit 63a3f603413f