linux-kernel - Re: linux-next: manual merge of the davinci 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] [day] [month] [year] [list]

Date:	Tue, 19 Oct 2010 08:46:41 -0700
From:	Kevin Hilman <khilman@...prootsystems.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sekhar Nori <nsekhar@...com>,
	Nicolas Pitre <nicolas.pitre@...aro.org>,
	Russell King <rmk+lkml@....linux.org.uk>
Subject: Re: linux-next: manual merge of the davinci tree with the arm tree

Stephen Rothwell <sfr@...b.auug.org.au> writes:

> Hi Kevin,
>
> Today's linux-next merge of the davinci tree got a conflicts in
> arch/arm/mach-davinci/board-da830-evm.c and
> arch/arm/mach-davinci/board-da850-evm.c between commit
> 861bd81ee62a0d6759144c22909a8a3938951656 ("arm: remove
> machine_desc.io_pg_offst and .phys_io") from the arm tree and commit
> 48ea89eabee96019a4a84615af921f8703320abb ("davinci: introduce support for
> AM1x ARM9 microprocessors") from the davinci tree.
>
> Just context changes,  I fixed them up (see below) and can carry the fix
> as necessary.

Hi Stephen,

Thanks for carrying this.

Russell has (temporarily) dropped his version of the patch, but when he
adds it back (today, I believe) I will fix this up in the davinci tree
by pre-merging his branch with mine to handle this conflict.

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