* linux-next: manual merge of the dma-buf tree with the staging tree
@ 2014-05-20 7:00 Stephen Rothwell
2014-05-20 7:06 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2014-05-20 7:00 UTC (permalink / raw)
To: Sumit Semwal, Greg KH
Cc: linux-next, linux-kernel, Maarten Lankhorst, Seunghun Lee
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the dma-buf tree with the staging tree
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
2014-05-20 8:04 ` Sumit Semwal
0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2014-05-20 7:06 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Sumit Semwal, linux-next, linux-kernel, Maarten Lankhorst,
Seunghun Lee
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the dma-buf tree with the staging tree
2014-05-20 7:06 ` Greg KH
@ 2014-05-20 8:04 ` Sumit Semwal
0 siblings, 0 replies; 3+ messages in thread
From: Sumit Semwal @ 2014-05-20 8:04 UTC (permalink / raw)
To: Greg KH; +Cc: Stephen Rothwell, linux-next, LKML, Maarten Lankhorst,
Seunghun Lee
On 20 May 2014 12:36, Greg KH <greg@kroah.com> wrote:
> 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
Sure Stephen,
Sounds good! Thanks.
Sumit
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-20 8:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2014-05-20 8:04 ` Sumit Semwal
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).