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  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Wed, 16 Dec 2020 12:00:25 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Michal Simek <monstr@...str.eu>
Cc:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the microblaze
 tree

Hi all,

On Thu, 10 Dec 2020 15:03:23 +0100 Michal Simek <monstr@...str.eu> wrote:
>
> On 10. 12. 20 5:58, Stephen Rothwell wrote:
> > 
> > Today's linux-next merge of the tip tree got conflicts in:
> > 
> >   arch/microblaze/Kconfig
> >   arch/microblaze/mm/Makefile
> > 
> > between commit:
> > 
> >   05cdf457477d ("microblaze: Remove noMMU code")
> > 
> > from the microblaze tree and commit:
> > 
> >   7ac1b26b0a72 ("microblaze/mm/highmem: Switch to generic kmap atomic")
> > 
> > from the tip 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 letting me know. I will mentioned it to Linus.
> Your resolution is correct.

These are now conflicts between the microblaze tree and Linus' tree.
-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists