Hi Stephen, On Wed, Jun 20, 2012 at 9:31 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi Ohad, > > Today's linux-next merge of the remoteproc tree got conflicts 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 > 7826bf782364 ("remoteproc: Pass struct fw to load_segments and > find_rsc_table"), a933c9f8ef8a ("remoteproc: Add function > rproc_get_boot_addr") and 32d46fe7f468 ("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 good, thanks! Ohad. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html