Messages in this thread | | | From | Ohad Ben-Cohen <> | Date | Mon, 16 Jul 2012 09:12:44 +0300 | 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@canb.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.
| |