linux-next: manual merge of the tip tree with the trivial tree

linux-next: manual merge of the tip tree with the trivial tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 840 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the tip tree with the trivial tree

[Jiri Kosina]

On Tue, 27 Mar 2018, Stephen Rothwell wrote:

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

Dropped. Thanks,

-- 
Jiri Kosina
SUSE Labs