linux-kernel - Re: linux-next: manual merge of the sh tree with Linus' 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20191204155540.4d43df45@canb.auug.org.au>
Date:   Wed, 4 Dec 2019 15:55:40 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Yoshinori Sato <ysato@...rs.sourceforge.jp>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Masahiro Yamada <yamada.masahiro@...ionext.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Subject: Re: linux-next: manual merge of the sh tree with Linus' tree

Hi all,

On Mon, 29 Jul 2019 09:25:10 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the sh tree got conflicts in:
> 
>   arch/sh/include/uapi/asm/setup.h
>   arch/sh/include/uapi/asm/types.h
> 
> between commit:
> 
>   d9c525229521 ("treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers")
> 
> from Linus' tree and commit:
> 
>   cd10afbc932d ("sh: remove unneeded uapi asm-generic wrappers")
> 
> from the sh tree.
> 
> I fixed it up (I just removed the files) 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.

Ping?
-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped