linux-kernel - Re: linux-next: manual merge of the kbuild tree with the sparc-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]

Message-Id: <20120515.235747.716576574995746023.davem@davemloft.net>
Date:	Tue, 15 May 2012 23:57:47 -0400 (EDT)
From:	David Miller <davem@...emloft.net>
To:	sfr@...b.auug.org.au
Cc:	mmarek@...e.cz, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, sam@...nborg.org
Subject: Re: linux-next: manual merge of the kbuild tree with the
 sparc-next tree

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Wed, 16 May 2012 13:44:30 +1000

> Today's linux-next merge of the kbuild tree got a conflict in
> arch/sparc/boot/Makefile between commit 51f19cfa76d7 ("sparc32: drop
> build time btfixup patching") from the sparc-next tree and commit
> 95698570510b ("kbuild: refactor final link of sparc32") from the kbuild
> tree.
> 
> I have no idea, so I used the version from the sparc-next tree.
> 
> Sam, can you have a look and work this out, please?

As Sam states in:

http://patchwork.ozlabs.org/patch/159094/

	This patch will conflict badly with a patch in kbuild-next.

	The fix is simple - drop all changes from kbuild-next.

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