linux-kernel - Re: linux-next: manual merge of the rr tree with the kbuild 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:	Fri, 27 Nov 2009 10:37:08 +0100
From:	Michal Marek <mmarek@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Rusty Russell <rusty@...tcorp.com.au>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Alan Jenkins <alan-jenkins@...fmail.co.uk>,
	Wenji Huang <wenji.huang@...cle.com>
Subject: Re: linux-next: manual merge of the rr tree with the kbuild tree

On 27.11.2009 03:22, Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next merge of the rr tree got a conflict in
> scripts/mod/modpost.c between commit
> 36021384778b40ffdd59ab34c275786507ef30a6 ("Kbuild: clear marker out of
> modpost") from the kbuild tree and commit
> 215143067b9bfacdfd475c5b2fa5536ee30f50ec ("kbuild: sort the list of
> symbols exported by the kernel (__ksymtab)") from the rr tree.

The "clear marker out of modpost" patch is a no-brainer and when it gets
merged doesn't matter that much. Rusty, would you mind moving it to your
tree? Alternatively, I can disable it in the kbuild tree for a while so
that the two trees don't clash.

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