From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Sumit Semwal <sumit.semwal@linaro•org>, Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Maarten Lankhorst <maarten.lankhorst@canonical•com>,
Seunghun Lee <waydi1@gmail•com>
Subject: linux-next: manual merge of the dma-buf tree with the staging tree
Date: Tue, 20 May 2014 17:00:31 +1000 [thread overview]
Message-ID: <20140520170031.1d27c26a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 533 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-05-20 7:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-20 7:00 Stephen Rothwell [this message]
2014-05-20 7:06 ` linux-next: manual merge of the dma-buf tree with the staging tree Greg KH
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=20140520170031.1d27c26a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maarten.lankhorst@canonical$(echo .)com \
--cc=sumit.semwal@linaro$(echo .)org \
--cc=waydi1@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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