linux-kernel - Re: linux-next: manual merge of the ceph 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: <alpine.DEB.2.00.1307092056360.22858@cobra.newdream.net>
Date:	Tue, 9 Jul 2013 20:57:15 -0700 (PDT)
From:	Sage Weil <sage@...tank.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
cc:	Sage Weil <sage@...dream.net>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Linus <torvalds@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the ceph tree with Linus' tree

On Wed, 10 Jul 2013, Stephen Rothwell wrote:
> Hi Sage,
> 
> Today's linux-next merge of the ceph tree got conflicts in
> drivers/block/rbd.c and net/ceph/osd_client.c because the ceph tree was
> rebased before being sent to Linus and it looks like one patch
> was dropped and several more added.
> 
> I just used the upstream version of the cpeh tree for today - please
> clean up.

Fixed, thanks!

sage
--
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/