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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/microblaze/include/asm/Kbuild

between commits:

  59d85c0a3696 ("microblaze: Remove architecture tlb.h and use generic one")
  7e8f54cd4e26 ("microblaze: Remove empty headers")

from the microblaze tree and commit:

  3ece10f6aa9e ("asm-generic: make more kernel-space headers mandatory")

from the akpm-current 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/microblaze/include/asm/Kbuild
index abb33619299b,f38696d2b462..000000000000
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@@ -1,40 -1,8 +1,11 @@@
  # SPDX-License-Identifier: GPL-2.0
  generated-y += syscall_table.h
- generic-y += bitops.h
- generic-y += bug.h
- generic-y += bugs.h
- generic-y += compat.h
- generic-y += device.h
- generic-y += div64.h
- generic-y += dma-mapping.h
- generic-y += emergency-restart.h
- generic-y += exec.h
  generic-y += extable.h
- generic-y += fb.h
- generic-y += hardirq.h
 +generic-y += hw_irq.h
- generic-y += irq_regs.h
- generic-y += irq_work.h
- generic-y += kdebug.h
- generic-y += kmap_types.h
- generic-y += kprobes.h
  generic-y += kvm_para.h
- generic-y += linkage.h
- generic-y += local.h
  generic-y += local64.h
  generic-y += mcs_spinlock.h
- generic-y += mm-arch-hooks.h
- generic-y += mmiowb.h
  generic-y += parport.h
- generic-y += percpu.h
- generic-y += preempt.h
- generic-y += serial.h
- generic-y += shmparam.h
  generic-y += syscalls.h
 +generic-y += tlb.h
- generic-y += topology.h
- generic-y += trace_clock.h
 +generic-y += user.h
- generic-y += vga.h
- generic-y += word-at-a-time.h
- generic-y += xor.h

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

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

[Michal Simek]

[-- Attachment #1.1: Type: text/plain, Size: 1260 bytes --]

Hi Stephen,

On 26. 02. 20 4:09, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   arch/microblaze/include/asm/Kbuild
> 
> between commits:
> 
>   59d85c0a3696 ("microblaze: Remove architecture tlb.h and use generic one")
>   7e8f54cd4e26 ("microblaze: Remove empty headers")
> 
> from the microblaze tree and commit:
> 
>   3ece10f6aa9e ("asm-generic: make more kernel-space headers mandatory")
> 
> from the akpm-current 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.

Thanks for heads up. I was expecting this conflict.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs



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