All of lore.kernel.org
 help / color / mirror / Atom feed
* linux-next: manual merge of the asm-generic tree with the kbuild tree
@ 2018-03-27 22:02 Stephen Rothwell
  2018-04-03 23:10 ` Stephen Rothwell
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2018-03-27 22:02 UTC (permalink / raw)
  To: Arnd Bergmann, Masahiro Yamada
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, James Hogan

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

Hi all,

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

  arch/metag/boot/dts/Makefile

between commit:

  b985b71d295f ("kbuild: mark $(targets) as .SECONDARY and remove .PRECIOUS markers")

from the kbuild tree and commit:

  bb6fb6dfcc17 ("metag: Remove arch/metag/")

from the asm-generic tree.

I fixed it up (I just removed the file) 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

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

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the asm-generic tree with the kbuild tree
@ 2024-03-06 22:38 Stephen Rothwell
  2024-03-12 23:10 ` Stephen Rothwell
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2024-03-06 22:38 UTC (permalink / raw)
  To: Arnd Bergmann, Masahiro Yamada
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

  arch/hexagon/Kconfig

between commit:

  6b1c2a19cb30 ("hexagon: select FRAME_POINTER instead of redefining it")

from the kbuild tree and commit:

  ba89f9c8ccba ("arch: consolidate existing CONFIG_PAGE_SIZE_*KB definitions")

from the asm-generic 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/hexagon/Kconfig
index 89672ef0666f,1414052e7d6b..000000000000
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@@ -7,9 -7,11 +7,13 @@@ config HEXAGO
  	select ARCH_32BIT_OFF_T
  	select ARCH_HAS_SYNC_DMA_FOR_DEVICE
  	select ARCH_NO_PREEMPT
 +	select ARCH_WANT_FRAME_POINTERS
  	select DMA_GLOBAL_POOL
 +	select FRAME_POINTER
+ 	select HAVE_PAGE_SIZE_4KB
+ 	select HAVE_PAGE_SIZE_16KB
+ 	select HAVE_PAGE_SIZE_64KB
+ 	select HAVE_PAGE_SIZE_256KB
  	# Other pending projects/to-do items.
  	# select HAVE_REGS_AND_STACK_ACCESS_API
  	# select HAVE_HW_BREAKPOINT if PERF_EVENTS

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

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the asm-generic tree with the kbuild tree
@ 2018-03-14 22:42 Stephen Rothwell
  2018-04-03 23:07 ` Stephen Rothwell
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2018-03-14 22:42 UTC (permalink / raw)
  To: Arnd Bergmann, Masahiro Yamada
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Nicholas Piggin

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

Hi Arnd,

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

  arch/blackfin/kernel/bfin_ksyms.c

between commit:

  4d9c7a5907dd ("kbuild: rename built-in.o to built-in.a")

from the kbuild tree and commit:

  e7e57f690e38 ("arch: remove blackfin port")

from the asm-generic tree.

I fixed it up (I just removed the file) 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

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

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-03-12 23:16 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-27 22:02 linux-next: manual merge of the asm-generic tree with the kbuild tree Stephen Rothwell
2018-04-03 23:10 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-03-06 22:38 Stephen Rothwell
2024-03-12 23:10 ` Stephen Rothwell
2018-03-14 22:42 Stephen Rothwell
2018-04-03 23:07 ` Stephen Rothwell

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.