linux-kernel - Re: [git pull -tip] headers_check fixes for other architectures

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: <20090131164410.GA11189@elte.hu>
Date:	Sat, 31 Jan 2009 17:44:10 +0100
From:	Ingo Molnar <mingo@...e.hu>
To:	Jaswinder Singh Rajput <jaswinder@...nel.org>
Cc:	Linus Torvalds <torvalds@...ux-foundation.org>,
	Sam Ravnborg <sam@...nborg.org>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Russell King - ARM Linux <linux@....linux.org.uk>,
	hskinnemoen@...el.com, cooloney@...nel.org, tony.luck@...el.com,
	ralf@...ux-mips.org, dhowells@...hat.com, matthew@....cx,
	chris@...kel.net, LKML <linux-kernel@...r.kernel.org>
Subject: Re: [git pull -tip] headers_check fixes for other architectures


* Jaswinder Singh Rajput <jaswinder@...nel.org> wrote:

> These are clean patches, I did not included anything which leads to any
> confusion or conflicts. I hope maintainers do not mind if these patches
> go to mainstream via Ingo's -tip along with other headers_check fixes.
> 
> Ingo please pull:
> The following changes since commit 83c21698257b3bbd96926480b26eaffb5a8c3946:
>   Ingo Molnar (1):
>         Merge branch 'x86/apic'
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip.git master

looks good, but could you please do this like you did the previous one: 
i.e. against your previous tree which was against Linus's tree?

The tree you did above includes a ton of other in-work trees that are in 
-tip, which orders your fixes to after those trees - i.e. to somewhere in 
the late 2.6.30 merge cycle.

So it's better to keep these separate. You can do this by basing your tree 
on tip:core/header-fixes:

   git checkout -b my-new-tree tip/core/header-fixes

That will give you a base of your previous tree (in a Git friendly way), 
plus Sam's fix.

Then you can git-cherry-pick all your new commits into that new tree, and 
send a pull request if you are happy with it. Likewise, you can probably 
achieve the same (with a lot less work) by doing this in your master 
branch above:

   git rebase --onto tip/core/header-fixes tip/master

(this assumes you have -tip set up as a remote repository.)

	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/