lkml.org 
[lkml]   [2020]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the akpm-current tree with the microblaze tree
From
Date
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


[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-02-27 09:53    [W:0.031 / U:3.920 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site