linux-kernel - linux-next: manual merge of the csky 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20200404101314.72468dd9@canb.auug.org.au>
Date:   Sat, 4 Apr 2020 10:13:14 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Guo Ren <ren_guo@...ky.com>
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: linux-next: manual merge of the csky tree with Linus' tree

Hi all,

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

  arch/csky/include/asm/Kbuild

between commit:

  630f289b7114 ("asm-generic: make more kernel-space headers mandatory")

from Linus' tree and commit:

  33e53ae1ce41 ("csky: Add kprobes supported")

from the csky tree.

I fixed it up (the former is a superset of the latter) 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

Content of type "application/pgp-signature" skipped