From mboxrd@z Thu Jan 1 00:00:00 1970 From: dinguyen@opensource.altera.com (Dinh Nguyen) Date: Fri, 5 Jun 2015 08:57:07 -0500 Subject: [PATCHv2 2/4] edac, altera: Refactor EDAC for Altera CycloneV SoC. In-Reply-To: <20150605091731.GA3679@pd.tnic> References: <1433428128-7292-1-git-send-email-tthayer@opensource.altera.com> <1433428128-7292-3-git-send-email-tthayer@opensource.altera.com> <55706E25.8050105@opensource.altera.com> <5570C479.7010902@opensource.altera.com> <20150604220609.GK3795@pd.tnic> <5570D0D0.9030803@opensource.altera.com> <20150605091731.GA3679@pd.tnic> Message-ID: <5571AAB3.2000005@opensource.altera.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > 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