From: Greg KH <greg@kroah.com>
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>
Subject: Re: linux-next: manual merge of the dma-buf tree with the staging tree
Date: Tue, 20 May 2014 16:06:05 +0900 [thread overview]
Message-ID: <20140520070605.GA7961@kroah.com> (raw)
In-Reply-To: <20140520170031.1d27c26a@canb.auug.org.au>
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
next prev parent reply other threads:[~2014-05-20 7:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-20 7:00 linux-next: manual merge of the dma-buf tree with the staging tree Stephen Rothwell
2014-05-20 7:06 ` Greg KH [this message]
2014-05-20 8:04 ` Sumit Semwal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140520070605.GA7961@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maarten.lankhorst@canonical.com \
--cc=sfr@canb.auug.org.au \
--cc=sumit.semwal@linaro.org \
--cc=waydi1@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).