linux-kernel - Re: [GIT PULL tip:x86/mm] Unify 32 and 64bit NUMA init paths

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: <20110502101828.GB27072@elte.hu>
Date:	Mon, 2 May 2011 12:18:28 +0200
From:	Ingo Molnar <mingo@...e.hu>
To:	Tejun Heo <tj@...nel.org>
Cc:	Ingo Molnar <mingo@...hat.com>, linux-kernel@...r.kernel.org,
	x86@...nel.org, Yinghai Lu <yinghai@...nel.org>
Subject: Re: [GIT PULL tip:x86/mm] Unify 32 and 64bit NUMA init paths


* Tejun Heo <tj@...nel.org> wrote:

> Hello, Ingo.
> 
> Please pull from the following branch to receive unification of 32 and
> 64bit NUMA init paths.
> 
>  git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git x86-mm
>  ssh://master.kernel.org/pub/scm/linux/kernel/git/tj/misc.git x86-mm
> 
> Other than addition of two patches from Yinghai and rebasing on top of
> x86/urgent, nothing has changed from the initial posting[1].
> 
> Please note that the tree is on top of
> 
>   x86/mm	c7a7b814c9dca9ee01b38e63b4a46de87156d3b6
> + x86/numa	993ba1585cbb03fab012e41d1a5d24330a283b31
> + x86/urgent	2be19102b71c1a45d37fec50303791daa1a06869
> 
> x86/urgent was needed for the following two NUMA fix commits.
> 
>  2be19102b7 "x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()"
>  765af22da8 "x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change"
> 
> I can regenerate tree such that it's x86/mm + x86/numa + cherry pick
> of the above two patches.  If that's preferred, please let me know.

Yeah, it's fine to me if you do merges, but could you please do a x86/mm tree 
where all your merge commit messages are amended with a 'Merge reason' 
explanation?

See commit a4c98f8bbeafee12c979c90743f6fda94f7515c7 for an example of how Merge 
reason lines look like.

This is what we do for all merge commits in the -tip tree - that way it's clear 
in retrospect why a particular merge was done.

Thanks,

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