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

Message-ID: <20180327144325.545af4fd@canb.auug.org.au>
Date:   Tue, 27 Mar 2018 14:43:25 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Jiri Kosina <jikos@...nel.org>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Lihao Liang <lianglihao@...wei.com>,
        Lai Jiangshan <jiangshanlai@...il.com>
Subject: linux-next: manual merge of the tip tree with the trivial tree

Hi all,

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

  kernel/cpu.c

between commit:

  ccd8c1c5926a ("CPU: Fix comment in cpuhp_bp_states[]")

from the trivial tree and commit:

  17a2f1ced028 ("cpu/hotplug: Merge cpuhp_bp_states and cpuhp_ap_states")

from the tip tree.

I fixed it up (the latter removed the comment updated by the former, so
I just did that) 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.

Jiri, you could drop (or revert) the commit in your tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped