On 28 May 2012 11:35, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi Sumit, Hi Stephen, > > 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. My apologies - I have updated this tree now, and you won't see this problem going forward. > > I have used the versions of these files from Linus' tree. > -- > Cheers, > Stephen Rothwell sfr@xxxxxxxxxxxxxxxx Thanks and regards, Sumit -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
