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

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

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

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

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

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