linux-kernel - Re: linux-next: manual merge of the remoteproc tree with Linus' 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAK=WgbaAiQPA+q40-4ej=EZqOfN+kAMwK5-7hg4MdvdwJ+febw@mail.gmail.com>
Date:	Mon, 16 Jul 2012 09:12:44 +0300
From:	Ohad Ben-Cohen <ohad@...ery.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Sjur Brændeland" 
	<sjur.brandeland@...ricsson.com>
Subject: Re: linux-next: manual merge of the remoteproc tree with Linus' tree

Hi Stephen,

On Mon, Jul 16, 2012 at 9:03 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Ohad,
>
> Today's linux-next merge of the remoteproc tree got a conflict in
> drivers/remoteproc/remoteproc_core.c between commits e981f6d41acd
> ("remoteproc: fix print format warnings") and 30338cf09f82 ("remoteproc:
> fix missing fault indication in error-path") from Linus' tree and commits
> bd4849848773 ("remoteproc: Pass struct fw to load_segments and
> find_rsc_table") and 72854fb042b1 ("remoteproc: Move Elf related
> functions to separate file") from the remoteproc tree.
>
> I fixed them up (see below) and can carry the fixes as necessary.

Looks great, thanks a lot!

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