linux-kernel - RE: linux-next: manual merge of the sound-asoc tree with the s5p 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] [day] [month] [year] [list]

Date:	Fri, 31 Dec 2010 10:59:47 +0900
From:	Kukjin Kim <kgene.kim@...sung.com>
To:	'Stephen Rothwell' <sfr@...b.auug.org.au>,
	'Mark Brown' <broonie@...nsource.wolfsonmicro.com>,
	'Liam Girdwood' <lrg@...mlogic.co.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	'Jassi Brar' <jassi.brar@...sung.com>
Subject: RE: linux-next: manual merge of the sound-asoc tree with the s5p tree

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

> Today's linux-next merge of the sound-asoc tree got a conflict in
> arch/arm/plat-samsung/include/plat/devs.h between commit
> 1b6e8eda6f0e7cd4f28e522a5e77e76f6985af9d ("Merge branch 'next-s5pv310'
> into for-next") from the s5p tree and commit
> 83e37b8e400ca51cc97946815b3055daacd92fa8 ("ARM: Samsung: Define common
> audio-dma device") from the sound-asoc tree.
> 
Oops, sorry for bothering again :-(
I will re-merge it in my for-next for avoiding conflict.

> I fixed it up (see below) and can carry the fix as necessary.

Thanks for your information and Happy New year!

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/