From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753255AbdIDGIA (ORCPT <rfc822;w@1wt.eu>);
        Mon, 4 Sep 2017 02:08:00 -0400
Received: from ozlabs.org ([103.22.144.67]:35479 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1753189AbdIDGH6 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 4 Sep 2017 02:07:58 -0400
Date: Mon, 4 Sep 2017 16:07:56 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>, Mark Brown <broonie@kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
        Juergen Gross <jgross@suse.com>
Subject: Re: linux-next: manual merge of the tip tree with the spi tree
Message-ID: <20170904160756.32f3a55c@canb.auug.org.au>
In-Reply-To: <20170828140503.63b569bb@canb.auug.org.au>
References: <20170828140503.63b569bb@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi all,

On Mon, 28 Aug 2017 14:05:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   tools/Makefile
> 
> between commit:
> 
>   e9d4650dcc59 ("spi: tools: add install section")
> 
> from the spi tree and commit:
> 
>   ecda85e70277 ("x86/lguest: Remove lguest support")
> 
> from the tip tree.
> 
> I fixed it up (see below) 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
> 
> diff --cc tools/Makefile
> index 616e7722b327,a19b176b914b..000000000000
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@@ -90,8 -89,8 +89,8 @@@ freefall: FORC
>   kvm_stat: FORCE
>   	$(call descend,kvm/$@)
>   
> - all: acpi cgroup cpupower gpio hv firewire lguest liblockdep \
> + all: acpi cgroup cpupower gpio hv firewire liblockdep \
>  -		perf selftests turbostat usb \
>  +		perf selftests spi turbostat usb \
>   		virtio vm net x86_energy_perf_policy \
>   		tmon freefall objtool kvm_stat
>   
> @@@ -101,7 -100,7 +100,7 @@@ acpi_install
>   cpupower_install:
>   	$(call descend,power/$(@:_install=),install)
>   
> - cgroup_install firewire_install gpio_install hv_install lguest_install perf_install spi_install usb_install virtio_install vm_install net_install objtool_install:
>  -cgroup_install firewire_install gpio_install hv_install perf_install usb_install virtio_install vm_install net_install objtool_install:
> ++cgroup_install firewire_install gpio_install hv_install perf_install spi_install usb_install virtio_install vm_install net_install objtool_install:
>   	$(call descend,$(@:_install=),install)
>   
>   liblockdep_install:

Just a reminder that this conflict still exists.

-- 
Cheers,
Stephen Rothwell