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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <3583538d-fc1a-823d-671a-8259f0e8ad41@monstr.eu>
Date:   Thu, 27 Feb 2020 09:52:43 +0100
From:   Michal Simek <monstr@...str.eu>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Andrew Morton <akpm@...ux-foundation.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Masahiro Yamada <masahiroy@...nel.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 microblaze tree

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




Download attachment "signature.asc" of type "application/pgp-signature" (196 bytes)