linux-kernel - Re: [PATCH 0/2]: Add sparc64 ftrace support.

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:	Wed, 14 May 2008 08:51:56 +0200
From:	Sam Ravnborg <sam@...nborg.org>
To:	Ingo Molnar <mingo@...e.hu>
Cc:	David Miller <davem@...emloft.net>, acme@...hat.com,
	srostedt@...hat.com, linux-kernel@...r.kernel.org,
	Pekka Paalanen <pq@....fi>, Pavel Roskin <proski@....org>,
	Soeren Sandmann Pedersen <sandmann@...hat.com>,
	Steven Rostedt <rostedt@...dmis.org>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>
Subject: Re: [PATCH 0/2]: Add sparc64 ftrace support.

> 
> [ also a patch integration detail: i took the liberty to move your 
>   arch/sparc64/Kconfig's HAVE_FTRACE to the first spot of the SPARC64 
>   select lines as per the second patch below - your patch had a conflict 
>   against current mainline (which probably means you already changed 
>   this file in your Sparc64 tree). By moving that entry to the first 
>   line your tree and the ftrace tree should auto-merge just fine without 
>   any conflicts. ]

When adding new select entries I try to keep them sorted alphabetically.
It will not solve all the merge issues but as the list grows this should
help. At least betterthan adding to the end.

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