Hi Boris, On 6/5/15 4:17 AM, Borislav Petkov wrote: > On Thu, Jun 04, 2015 at 05:27:28PM -0500, Dinh Nguyen wrote: >> This is my mistake. I applied Alan Tull's patch for suspend-to-ram which >> also touches drivers/edac/altera_edac.c. >> >> https://git.kernel.org/cgit/linux/kernel/git/dinguyen/linux.git/commit/?h=socfpga_for_next_arria10&id=d44a92eb044f4cc1abf34a790d647e9fa356d7b0 >> >> I think I will have to ask Alan to split up his patch and send the part >> that touches altera_edac.c to linux-edac. > > Nah, that's fine. If it is that hunk adding altr_sdram_prepare(), he can > simply add my ACK for the EDAC bits: > > Acked-by: Borislav Petkov <bp@xxxxxxx> > Thanks alot for doing that! But I have sent you a separate patch for this. It would have caused a merge conflict for v4.2 if I left the suspend-to-ram patch as is. Thanks, Dinh -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html