linux-kernel - RE: linux-next: manual merge of the s5p tree with the arm 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: <03f901cb6e5f$6ff5f690$4fe1e3b0$%kim@samsung.com>
Date:	Mon, 18 Oct 2010 09:57:25 +0900
From:	Kukjin Kim <kgene.kim@...sung.com>
To:	'Stephen Rothwell' <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	'Jeremy Kerr' <jeremy.kerr@...onical.com>,
	'Lorenzo Pieralisi' <lorenzo.pieralisi@....com>,
	'Jason Wang' <jason77.wang@...il.com>,
	'Tony Lindgren' <tony@...mide.com>,
	'Russell King' <rmk@....linux.org.uk>
Subject: RE: linux-next: manual merge of the s5p tree with the arm tree

Stephen Rothwell wrote:
> 
> Hi Kukjin,
> 
Hi Stephen :-)

> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-s5p6440/include/mach/debug-macro.S between commit
> 08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and
> virtual addresses from addruart") from the arm tree and commit
> 29159b7dd244def6e0073ff0e2d4cbb59599187f ("ARM: S5P64X0: Add S5P64X0
> (S5P6440 and S5P6450) initialization support") from the s5p tree.
> 
Hmm...ok...

> The latter removed the file modified by the former.  I did that.
> 
Ok.

> The appropriate part of the above arm commit needs to be done for the new
> file arch/arm/mach-s5p64x0/include/mach/debug-macro.S .  Unfortunately, I
> am unqualified to do that ...

I see...so may I do only fix
arch/arm/mach-s5p64x0/include/mach/debug-macro.S in my tree?
Or...need to fix other things?

Anyway, thanks for your linux-next ;-)

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@...sung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

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