linux-kernel - Re: [GIT PULL for 38-rc3] target updates for v4.0.0-rc7

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 for Android: free password hash cracker in your pocket

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

Message-ID: <1295919523.15425.104.camel@mulgrave.site>
Date:	Mon, 24 Jan 2011 19:38:43 -0600
From:	James Bottomley <James.Bottomley@...e.de>
To:	"Nicholas A. Bellinger" <nab@...ux-iscsi.org>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	Christoph Hellwig <hch@....de>,
	Mike Christie <michaelc@...wisc.edu>,
	FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-scsi <linux-scsi@...r.kernel.org>,
	LKML <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL for 38-rc3]  target updates for v4.0.0-rc7

On Mon, 2011-01-24 at 17:27 -0800, Nicholas A. Bellinger wrote:
> On Mon, 2011-01-24 at 18:36 -0600, James Bottomley wrote:
> > On Mon, 2011-01-24 at 16:14 -0800, Nicholas A. Bellinger wrote:
> > > Hi James and Co,
> > > 
> > > Here are the latest v4.0.0-rc7 updates for mainline drivers/target/ code
> > > rebased against linux-2.6.git -> .38-rc2.  These individual patches have
> > > been reviewed on linux-scsi and commited into the upstream LIO kernel
> > > tree, so please consider pulling for .38-rc3:
> > > 
> > >    git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6.git for-38-rc3
> > > 
> > > Also at this point, having Linus pull directly from
> > > scsi-post-merge-2.6.git/for-38-rcX for mainline target bugfixes +
> > > improvements may make more sense.
> > > 
> > > Linus/Andrew/James, please let me know which you prefer here.
> > 
> > Right at the moment, I'm trying to encourage a few people with
> > established areas to experiment with their own git trees in SCSI, but
> > the target subsystem, being a newcomer, wouldn't be one of these, so,
> > for the time being, patch series over linux-scsi please for review and
> > feedback.
> > 
> 
> Sure, thanks for the clarification.  The same set of patches are
> available against your .37-FINAL based scsi-post-merge-2.6.git/master
> HEAD here:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6.git for-jejb
> 
> Please let me know if you have any further questions,

Over the list, please, not in a git tree.  What I need is for others to
review them ... and appearing on the list best encourages that.

It's also better to use something more stable as the base, like linus
head or scsi-misc as the base.  The postmerge tree is my most volatile
tree (fairly constantly rebasing as I try to get the merge fixes
right) ... and it's currently defunct until another merge clash appears.

By way of demonstration, try pulling your current postmerge tree into
linus head and see what happens (the resulting conflicts are because of
the rebases).

James


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