netdev - Re: linux-next: manual merge of the tip tree with the net-next 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]

Date:	Tue, 14 Jan 2014 16:44:20 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>
Cc:	hpa@...or.com, tglx@...utronix.de, mingo@...nel.org,
	peterz@...radead.org, netdev@...r.kernel.org,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the tip tree with the net-next tree

On Mon, 13 Jan 2014 21:19:46 -0800 (PST) David Miller <davem@...emloft.net> wrote:
>
> From: "H. Peter Anvin" <hpa@...or.com>
> Date: Mon, 13 Jan 2014 20:51:43 -0800
> 
> > Is there a sensible way we can fix this in either net-next or tip?
> 
> I think if I sort the files in net-next the problem will go away,
> if someone can confirm this I'll do it.

I have attached 2 patches: one for net-next and one for tip/auto-latest
(but should be applicable in the appropriate topic branch).  If both are
applied to their respect trees, then I get no conflict when merging the
two trees.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

View attachment "0001-net-resort-some-Kbuild-files-to-hopefully-help-avoid.patch" of type "text/x-diff" (3229 bytes)

View attachment "0001-tip-resort-some-Kbuild-files-to-hopefully-help-avoid.patch" of type "text/x-diff" (3741 bytes)

Content of type "application/pgp-signature" skipped