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 S1751466AbbINEZi (ORCPT <rfc822;w@1wt.eu>);
	Mon, 14 Sep 2015 00:25:38 -0400
Received: from out3-smtp.messagingengine.com ([66.111.4.27]:53758 "EHLO
	out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1750968AbbINEZg (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 14 Sep 2015 00:25:36 -0400
X-Sasl-enc: 0DAwzFn8giP5sjRo3kbrxnPsIE6G/RIdgHAWj3h3ncPd 1442204735
Date: Sun, 13 Sep 2015 21:25:34 -0700
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Daniel Mack <daniel@zonque.org>, Pranith Kumar <bobby.prani@gmail.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
        David Herrmann <dh.herrmann@gmail.com>,
        Djalal Harouni <tixxdz@opendz.org>
Subject: Re: linux-next: manual merge of the kdbus tree with Linus' tree
Message-ID: <20150914042534.GA27042@kroah.com>
References: <20150914105356.02aef8f0@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150914105356.02aef8f0@canb.auug.org.au>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Sep 14, 2015 at 10:53:56AM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the kdbus tree got a conflict in:
> 
>   tools/testing/selftests/Makefile
> 
> between commit:
> 
>   b6d973441675 ("selftests: add membarrier syscall test")
> 
> from Linus' tree and commit:
> 
>   b7270dd9f7d4 ("kdbus: add selftests")
> 
> from the kdbus tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc tools/testing/selftests/Makefile
> index 89b05e2222c9,b57100cefb74..000000000000
> --- a/tools/testing/selftests/Makefile
> +++ b/tools/testing/selftests/Makefile
> @@@ -4,9 -4,8 +4,10 @@@ TARGETS += efivarf
>   TARGETS += exec
>   TARGETS += firmware
>   TARGETS += ftrace
>  +TARGETS += futex
>   TARGETS += kcmp
> + TARGETS += kdbus
>  +TARGETS += membarrier
>   TARGETS += memfd
>   TARGETS += memory-hotplug
>   TARGETS += mount

Looks good to me, thanks.

greg k-h