lkml.org 
[lkml]   [2012]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the dma-buf tree with Linus' tree
Hi Sumit,

Today's linux-next merge of the dma-buf tree got conflicts in
drivers/base/dma-buf.c and include/linux/dma-buf.h between various
commits from Linus' tree and various commits from the dma-buf tree.

Again, another tree that was rebased before or after being sent
upstream. Please don't do this.

I have used the versions of these files from Linus' tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-05-28 06:01    [W:0.047 / U:49.852 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site