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@xxxxxxxxxxxxxxxx
Attachment:
pgpgM5n8uYzlK.pgp
Description: PGP signature
