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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAO_48GGkMemXg2nMiU5y-Kb3BJPVP6adY+dtCUDKJV9U+7bo-A@mail.gmail.com>
Date:	Mon, 28 May 2012 18:10:32 +0800
From:	Sumit Semwal <sumit.semwal@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the dma-buf tree with Linus' tree

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

Thanks and regards,
Sumit
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/