linux-kernel - Re: [git pull v3.0-rc1] What branch to base fixes for v3.0-rc1 for block system?

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <4DE54097.7060000@fusionio.com>
Date:	Tue, 31 May 2011 21:25:11 +0200
From:	Jens Axboe <jaxboe@...ionio.com>
To:	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
CC:	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [git pull v3.0-rc1] What branch to base fixes for v3.0-rc1 for
  block system?

On 2011-05-31 21:10, Konrad Rzeszutek Wilk wrote:
> Hey Jens,
> 
> I've got two tiny fixes for the xen-blkback (see below):
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git for-jens/xen-blkback.fixes
> 
> and they are based on for-2.6.40/drivers branch. Is that the way you
> prefer to pull patches from sub-trees? Or should I rebase it on 3.0-rc1?
> Or should send bug-fixes just directly to Linus?

Once I send off the big initial merges which are in the version named
for-2.6.40/xx branches, anything after that should just be based on my
for-linus branch. That's what I use for post-rc1 merges with Linus.

But the only real sticking point is that your branch should not contain
something that I don't have in my for-linus. And you don't right now, so
I just pulled it :-)

-- 
Jens Axboe

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