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

Hi all, On Thu, 8 Apr 2021 20:34:49 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > Makefile This also affected init/Kconfig > between commit: > > 2f8864dbe668 ("kbuild: move module strip/compression code into > scripts/Makefile

linux-next: manual merge of the akpm-current tree with the kbuild tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: Makefile between commit: 2f8864dbe668 ("kbuild: move module strip/compression code into scripts/Makefile.modinst") from the kbuild tree and commit: 7b35c1a01c2e ("init: add support for zstd compressed modules"

linux-next: manual merge of the akpm-current tree with the kbuild tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: Makefile between commit: 0e92fd54b7c1 ("kbuild: remove {CLEAN,MRPROPER,DISTCLEAN}_DIRS") from the kbuild tree and commit: 51b26a64f220 ("scripts/tags.sh: add a intermediate file for 'make gtags'") from the akp

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

Hi all, On Fri, 3 Aug 2018 18:36:53 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > lib/Kconfig.debug > > between commit: > > 06ec64b84c35 ("Kconfig: consolidate the "Kernel hacking" menu") > > from the kbuild tree and commit: >

linux-next: manual merge of the akpm-current tree with the kbuild tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: lib/Kconfig.debug between commit: 06ec64b84c35 ("Kconfig: consolidate the "Kernel hacking" menu") from the kbuild tree and commit: bbd89226bb66 ("fs/buffer.c: add debug print for __getblk_gfp() stall problem")

linux-next: manual merge of the akpm-current tree with the kbuild tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: Makefile between commit: 2e026cb9ffbb ("kbuild: do not call cc-option before KBUILD_CFLAGS initialization") from the kbuild tree and commit: 56db01c150f1 ("Makefile: support flag -fsanitizer-coverage=trace-

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

On 2016-01-06 07:54, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > scripts/tags.sh > > between commit: > > 93209d65c1d3 ("tags: Unify emacs and exuberant rules") > > from the kbuild tree and commit: > > ef0e95208c33 ("p

linux-next: manual merge of the akpm-current tree with the kbuild tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: scripts/tags.sh between commit: 93209d65c1d3 ("tags: Unify emacs and exuberant rules") from the kbuild tree and commit: ef0e95208c33 ("page-flags: drop __TestClearPage*() helpers") from the akpm-current tre

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

On 7.11.2013 07:37, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in > scripts/bloat-o-meter between commit 21cf6e584ce3 ("kbuild, > bloat-o-meter: fix static detection") from the kbuild tree and commit > 372dd3b27736 ("scripts/bloat-o-me

linux-next: manual merge of the akpm-current tree with the kbuild tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in scripts/bloat-o-meter between commit 21cf6e584ce3 ("kbuild, bloat-o-meter: fix static detection") from the kbuild tree and commit 372dd3b27736 ("scripts/bloat-o-meter: ignore changes in the size of linux_banner") from t