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] [thread-next>] [day] [month] [year] [list]

Message-Id: <20101011193336.835d9f78.sfr@canb.auug.org.au>
Date:	Mon, 11 Oct 2010 19:33:36 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Kukjin Kim <kgene.kim@...sung.com>
Cc:	'Mark Brown' <broonie@...nsource.wolfsonmicro.com>,
	'Liam Girdwood' <lrg@...mlogic.co.uk>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	'Dimitris Papastamos' <dp@...nsource.wolfsonmicro.com>
Subject: Re: linux-next: manual merge of the sound-asoc tree with the s5p
 tree

Hi Kgene,

On Mon, 11 Oct 2010 16:33:48 +0900 Kukjin Kim <kgene.kim@...sung.com> wrote:
>
> > Today's linux-next merge of the sound-asoc tree got a conflict in
> > arch/arm/mach-s3c64xx/dev-audio.c between commit
> > f08269d850e4ee0cd028cf5279cc08259d0469df ("ARM: S3C64XX: Change to using
> > s3c_gpio_cfgpin_range()") from the s5p tree and commit
> > e4b6b74ffd32d114227a5dcfe814e2cecd80554b ("ARM: S3C64XX: Fix fallthrough
> > bug in i2sv3 gpio configuration, improve logging") from the sound-asoc
> > tree.
> > 
> Hmm...how can/should I handle for it?

Don't worry about it.  It is trivial and both I and Linus can take care
of it.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped