From mboxrd@z Thu Jan  1 00:00:00 1970
From: Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the dma-buf tree with the staging
 tree
Date: Tue, 20 May 2014 16:06:05 +0900
Message-ID: <20140520070605.GA7961@kroah.com>
References: <20140520170031.1d27c26a@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20140520170031.1d27c26a@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Sumit Semwal <sumit.semwal@linaro.org>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Maarten Lankhorst <maarten.lankhorst@canonical.com>, Seunghun Lee <waydi1@gmail.com>
List-Id: linux-next.vger.kernel.org

On Tue, May 20, 2014 at 05:00:31PM +1000, Stephen Rothwell wrote:
> Hi Sumit,
> 
> Today's linux-next merge of the dma-buf tree got a conflict in
> drivers/staging/android/sync.c between commit 10f62861b4a2 ("staging:
> android: fix missing a blank line after declarations") from the staging
> tree and commit 85958aff6184 ("android: convert sync to fence api, v5")
> from the dma-buf tree.
> 
> I fixed it up (I just used the dma-buf tree version of conflicting
> sections) and can carry the fix as necessary (no action is required).

Sounds good, thanks.

greg k-h