linux-next: manual merge of the dma-buf tree with Linus' tree

linux-next: manual merge of the dma-buf tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 447 bytes --]

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the dma-buf tree with Linus' tree

[Sumit Semwal]

On 28 May 2012 11:35, Stephen Rothwell <sfr@canb.auug.org.au> 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@canb.auug.org.au

Thanks and regards,
Sumit