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

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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the akpm tree got a conflict in:

  arch/xtensa/include/asm/Kbuild

between commit:

  35ff5ae79f85 ("xtensa: move generic-y of exported headers to uapi/asm/Kbuild")

from the kbuild tree and patch:

  "xtensa: use generic fb.h"

from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/xtensa/include/asm/Kbuild
index c04efde775a5,bdc12d426b24..000000000000
--- a/arch/xtensa/include/asm/Kbuild
+++ b/arch/xtensa/include/asm/Kbuild
@@@ -3,9 -4,13 +3,10 @@@ generic-y += clkdev.
  generic-y += div64.h
  generic-y += dma-contiguous.h
  generic-y += emergency-restart.h
 -generic-y += errno.h
  generic-y += exec.h
  generic-y += extable.h
+ generic-y += fb.h
 -generic-y += fcntl.h
  generic-y += hardirq.h
 -generic-y += ioctl.h
  generic-y += irq_regs.h
  generic-y += irq_work.h
  generic-y += kdebug.h

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

[Masahiro Yamada]

On Tue, Jan 22, 2019 at 1:06 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
>   Makefile
>
> between commit:
>
>   b57304bb03de ("kbuild: remove meaningless prepare2 target")
>
> from the kbuild tree and patch:
>
>   "locking/atomics: build atomic headers as required"


This has been sitting around since the previous development cycle.
The relevant patches were not sent to Linus in the previous MW.

I believe those should be dropped entirely,
and re-implemented cleanly/correctly if Mark Rutland wants this change.

People already pointed out the scripts are so slow,
but that is not the only problem.

[1] I see annoying log message
    "Nothing to be done for 'all'"
    for every incremental build

[2] Dependencies might not be sufficient.
    For example, nothing is rebuilt when scripts/atomic/fallbacks/* is touched.

[3] I do not understand why scripts/Makefile.genheader must be added.






> from the akpm tree.
>
> I fixed it up (I hope - see below) and can carry the fix as necessary.
> This is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc Makefile
> index 004a190e3ece,bd0f79d8295e..000000000000
> --- a/Makefile
> +++ b/Makefile
> @@@ -1077,8 -1077,12 +1077,8 @@@ ifneq ($(KBUILD_SRC),
>         fi;
>   endif
>
> - prepare1: prepare3 outputmakefile asm-generic $(version_h) $(autoksyms_h) \
> -                                               include/generated/utsrelease.h
>  -# prepare2 creates a makefile if using a separate output directory.
>  -# From this point forward, .config has been reprocessed, so any rules
>  -# that need to depend on updated CONFIG_* values can be checked here.
>  -prepare2: prepare3 outputmakefile asm-generic genheader
>  -
>  -prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h
> ++prepare1: prepare3 outputmakefile asm-generic genheader $(version_h) \
> ++                              $(autoksyms_h) include/generated/utsrelease.h
>         $(cmd_crmodverdir)
>
>   archprepare: archheaders archscripts prepare1 scripts



-- 
Best Regards
Masahiro Yamada

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1575 bytes --]

Hi all,

Today's linux-next merge of the akpm tree got a conflict in:

  Makefile

between commit:

  b57304bb03de ("kbuild: remove meaningless prepare2 target")

from the kbuild tree and patch:

  "locking/atomics: build atomic headers as required"

from the akpm tree.

I fixed it up (I hope - see below) and can carry the fix as necessary.
This is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Makefile
index 004a190e3ece,bd0f79d8295e..000000000000
--- a/Makefile
+++ b/Makefile
@@@ -1077,8 -1077,12 +1077,8 @@@ ifneq ($(KBUILD_SRC),
  	fi;
  endif
  
- prepare1: prepare3 outputmakefile asm-generic $(version_h) $(autoksyms_h) \
- 						include/generated/utsrelease.h
 -# prepare2 creates a makefile if using a separate output directory.
 -# From this point forward, .config has been reprocessed, so any rules
 -# that need to depend on updated CONFIG_* values can be checked here.
 -prepare2: prepare3 outputmakefile asm-generic genheader
 -
 -prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h
++prepare1: prepare3 outputmakefile asm-generic genheader $(version_h) \
++				$(autoksyms_h) include/generated/utsrelease.h
  	$(cmd_crmodverdir)
  
  archprepare: archheaders archscripts prepare1 scripts

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Michal Marek]

On 4.7.2013 06:43, Andrew Morton wrote:
> On Thu, 4 Jul 2013 14:33:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
>> Hi Andrew,
>>
>> Today's linux-next merge of the akpm tree got conflicts in
>> tools/include/tools/be_byteshift.h and tools/include/tools/le_byteshift.h
>> between commit b35310627f39 ("tools/include: use stdint types for
>> user-space byteshift headers") from the kbuild tree and commit
>> "scripts/sortextable.c: fix building on non-Linux systems" from the
>> akpm tree.
>>
>> As fas as I can tell, these patches do the same thing except one uses
>> stdint.h and the other inttypes.h.  I just dropped the akpm tree patch.
> 
> Well OK, but new patches really shouldn't be popping up in the middle
> of the merge window like this.

Sorry for that.


> AFAICT Yaakov (re)sent this patch way back in April, so it should have
> been in -next for a long time.  Something has gone wrong here.

I only saw an email from June 26, I wasn't on the CC list of the
previous submissions.

Michal

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

[Andrew Morton]

On Thu, 4 Jul 2013 14:33:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got conflicts in
> tools/include/tools/be_byteshift.h and tools/include/tools/le_byteshift.h
> between commit b35310627f39 ("tools/include: use stdint types for
> user-space byteshift headers") from the kbuild tree and commit
> "scripts/sortextable.c: fix building on non-Linux systems" from the
> akpm tree.
> 
> As fas as I can tell, these patches do the same thing except one uses
> stdint.h and the other inttypes.h.  I just dropped the akpm tree patch.

Well OK, but new patches really shouldn't be popping up in the middle
of the merge window like this.

AFAICT Yaakov (re)sent this patch way back in April, so it should have
been in -next for a long time.  Something has gone wrong here.

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got conflicts in
tools/include/tools/be_byteshift.h and tools/include/tools/le_byteshift.h
between commit b35310627f39 ("tools/include: use stdint types for
user-space byteshift headers") from the kbuild tree and commit
"scripts/sortextable.c: fix building on non-Linux systems" from the
akpm tree.

As fas as I can tell, these patches do the same thing except one uses
stdint.h and the other inttypes.h.  I just dropped the akpm tree patch.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 450 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm 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
"timeconst.pl: remove deprecated defined(@array)" from the akpm tree.

I just dropped the akpm tree patch since the file had been deleted by the
kbuild tree commit.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 4518 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
scripts/tags.sh between commit 9f14b4201239 ("scripts/tags.sh: Fix regex
syntax for etags") from the kbuild tree and commit "scripts/tags.sh: add
magic for declarations of popular kernel type" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc scripts/tags.sh
index 4c53b7d,b33e7ce..0000000
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@@ -205,30 -221,41 +221,41 @@@ emacs(
  	--regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/'   \
  	--regex='/^TRACE_EVENT(\([^,)]*\).*/trace_\1/'		\
  	--regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1/' \
 -	--regex='/PAGEFLAG\(([^,)]*).*/Page\1/'			\
 -	--regex='/PAGEFLAG\(([^,)]*).*/SetPage\1/'		\
 -	--regex='/PAGEFLAG\(([^,)]*).*/ClearPage\1/'		\
 -	--regex='/TESTSETFLAG\(([^,)]*).*/TestSetPage\1/'	\
 -	--regex='/TESTPAGEFLAG\(([^,)]*).*/Page\1/'		\
 -	--regex='/SETPAGEFLAG\(([^,)]*).*/SetPage\1/'		\
 -	--regex='/__SETPAGEFLAG\(([^,)]*).*/__SetPage\1/'	\
 -	--regex='/TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/'	\
 -	--regex='/__TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/'	\
 -	--regex='/CLEARPAGEFLAG\(([^,)]*).*/ClearPage\1/'	\
 -	--regex='/__CLEARPAGEFLAG\(([^,)]*).*/__ClearPage\1/'	\
 -	--regex='/__PAGEFLAG\(([^,)]*).*/__SetPage\1/'		\
 -	--regex='/__PAGEFLAG\(([^,)]*).*/__ClearPage\1/'	\
 -	--regex='/PAGEFLAG_FALSE\(([^,)]*).*/Page\1/'		\
 -	--regex='/TESTSCFLAG\(([^,)]*).*/TestSetPage\1/'	\
 -	--regex='/TESTSCFLAG\(([^,)]*).*/TestClearPage\1/'	\
 -	--regex='/SETPAGEFLAG_NOOP\(([^,)]*).*/SetPage\1/'	\
 -	--regex='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/'	\
 -	--regex='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/' \
 -	--regex='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
 -	--regex='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
 -	--regex='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'			\
 -	--regex='/PCI_OP_READ\((\w*).*[1-4]\)/pci_bus_read_config_\1/'	\
 -	--regex='/PCI_OP_WRITE\((\w*).*[1-4]\)/pci_bus_write_config_\1/'\
 +	--regex='/PAGEFLAG(\([^,)]*\).*/Page\1/'			\
 +	--regex='/PAGEFLAG(\([^,)]*\).*/SetPage\1/'		\
 +	--regex='/PAGEFLAG(\([^,)]*\).*/ClearPage\1/'		\
 +	--regex='/TESTSETFLAG(\([^,)]*\).*/TestSetPage\1/'	\
 +	--regex='/TESTPAGEFLAG(\([^,)]*\).*/Page\1/'		\
 +	--regex='/SETPAGEFLAG(\([^,)]*\).*/SetPage\1/'		\
 +	--regex='/__SETPAGEFLAG(\([^,)]*\).*/__SetPage\1/'	\
 +	--regex='/TESTCLEARFLAG(\([^,)]*\).*/TestClearPage\1/'	\
 +	--regex='/__TESTCLEARFLAG(\([^,)]*\).*/TestClearPage\1/'	\
 +	--regex='/CLEARPAGEFLAG(\([^,)]*\).*/ClearPage\1/'	\
 +	--regex='/__CLEARPAGEFLAG(\([^,)]*\).*/__ClearPage\1/'	\
 +	--regex='/__PAGEFLAG(\([^,)]*\).*/__SetPage\1/'		\
 +	--regex='/__PAGEFLAG(\([^,)]*\).*/__ClearPage\1/'	\
 +	--regex='/PAGEFLAG_FALSE(\([^,)]*\).*/Page\1/'		\
 +	--regex='/TESTSCFLAG(\([^,)]*\).*/TestSetPage\1/'	\
 +	--regex='/TESTSCFLAG(\([^,)]*\).*/TestClearPage\1/'	\
 +	--regex='/SETPAGEFLAG_NOOP(\([^,)]*\).*/SetPage\1/'	\
 +	--regex='/CLEARPAGEFLAG_NOOP(\([^,)]*\).*/ClearPage\1/'	\
 +	--regex='/__CLEARPAGEFLAG_NOOP(\([^,)]*\).*/__ClearPage\1/' \
 +	--regex='/TESTCLEARFLAG_FALSE(\([^,)]*\).*/TestClearPage\1/' \
 +	--regex='/__TESTCLEARFLAG_FALSE(\([^,)]*\).*/__TestClearPage\1/' \
 +	--regex='/_PE(\([^,)]*\).*/PEVENT_ERRNO__\1/'		\
- 	--regex='/PCI_OP_READ(\([a-z]*[a-z]\).*[1-4])/pci_bus_read_config_\1/' \
- 	--regex='/PCI_OP_WRITE(\([a-z]*[a-z]\).*[1-4])/pci_bus_write_config_\1/'
++	--regex='/PCI_OP_READ(\(\w\).*[1-4])/pci_bus_read_config_\1/' \
++	--regex='/PCI_OP_WRITE(\(\w\).*[1-4])/pci_bus_write_config_\1/' \
+ 	--regex='/DEFINE_(MUTEX|SEMAPHORE|SPINLOCK)\((\w*)/\2/v/'	\
+ 	--regex='/DEFINE_(RAW_SPINLOCK|RWLOCK|SEQLOCK)\((\w*)/\2/v/'	\
+ 	--regex='/DECLARE_(RWSEM|COMPLETION)\((\w*)/\2/v/'		\
+ 	--regex='/DECLARE_BITMAP\((\w*)/\1/v/'				\
+ 	--regex='/(^|\s)(|L|H)LIST_HEAD\((\w*)/\3/v/'			\
+ 	--regex='/(^|\s)RADIX_TREE\((\w*)/\2/v/'			\
+ 	--regex='/DEFINE_PER_CPU\(([^,]*,\s*)(\w*).*\)/\2/v/'		\
+ 	--regex='/DEFINE_PER_CPU_SHARED_ALIGNED\(([^,]*,\s*)(\w*).*\)/\2/v/' \
+ 	--regex='/DECLARE_WAIT_QUEUE_HEAD\((\w*)/\1/v/'			\
+ 	--regex='/DECLARE_(TASKLET|WORK|DELAYED_WORK)\((\w*)/\2/v/'	\
+ 	--regex='/DEFINE_PCI_DEVICE_TABLE\((\w*)/\1/v/'
  
  	all_kconfigs | xargs $1 -a                              \
  	--regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]