linux-kernel - linux-next: manual merge of the kbuild tree with the kbuild-current 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>] [day] [month] [year] [list]

Message-ID: <20181113093050.6785eec5@canb.auug.org.au>
Date:   Tue, 13 Nov 2018 09:30:50 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Masahiro Yamada <yamada.masahiro@...ionext.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Changbin Du <changbin.du@...il.com>
Subject: linux-next: manual merge of the kbuild tree with the kbuild-current
 tree

Hi all,

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

  init/Kconfig

between commit:

  f9af851aa8e7 ("kernel hacking: support building kernel with -Og optimization level")

from the kbuild-current tree and commit:

  a4219aff51b8 ("kernel hacking: support building kernel with -Og optimization level")

from the kbuild tree.

I fixed it up (I used the kbuild-current tree version) 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