Messages in this thread | | | Date | Mon, 28 May 2012 13:35:40 +1000 | From | Stephen Rothwell <> | Subject | linux-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] | |