linux-kernel - RE: linux-next: build failure after merge of the staging 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <e0be2242-530b-46cd-ad3a-d49fd60345ab@default>
Date:	Tue, 14 Feb 2012 16:54:37 -0800 (PST)
From:	Dan Magenheimer <dan.magenheimer@...cle.com>
To:	Greg KH <gregkh@...uxfoundation.org>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Seth Jennings <sjenning@...ux.vnet.ibm.com>,
	Nitin Gupta <ngupta@...are.org>,
	Konrad Wilk <konrad.wilk@...cle.com>
Subject: RE: linux-next: build failure after merge of the staging tree

> From: Greg KH [mailto:gregkh@...uxfoundation.org]
> Subject: Re: linux-next: build failure after merge of the staging tree
> 
> > > Ok, now reverted, what a mess...
> > >
> > > greg k-h
> >
> > OK, I have just posted the ramster v5 patchset which applies against
> > linux-3.2.  I've test-built it against linux-next... it only gets
> > the normal minor merge conflicts for adding a line to
> > drivers/staging/Makefile and Kconfig.
> 
> Please resend after fixing that conflict, as it would require me to edit
> it by hand in order to apply this.  As you have already redone the
> patch, there's no reason I should have to do this, right?

OK.  I'm not quite sure how to generate a patchset or a
git commit-set that applies cleanly against two different
trees (3.2 and linux-next), but I guess common sense should
tell me that, since the patches have to go through staging-next
first and you are applying patches rather than git-pull'ing,
staging-next should be my preferred choice for a base.

Do you want me to resend all 6 patches?  The only patch
affected is patch 6 of 6.  All others apply cleanly.
Let me know and I will resend one or all tomorrow.

Sorry for the noise/hassle, but this is a learning process...

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