linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] EDAC fix for 5.0
@ 2019-01-27 11:41 Borislav Petkov
  2019-01-27 19:05 ` pr-tracker-bot
  0 siblings, 1 reply; 2+ messages in thread
From: Borislav Petkov @ 2019-01-27 11:41 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-edac, lkml

Hi Linus,

please pull this single fix for Altera EDAC below.

Thx.

---
The following changes since commit 49a57857aeea06ca831043acbb0fa5e0f50602fd:

  Linux 5.0-rc3 (2019-01-21 13:14:44 +1300)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git tags/edac_fix_for_5.0

for you to fetch changes up to 245b6c6558128327d330549b23d09594c46f58df:

  EDAC, altera: Fix S10 persistent register offset (2019-01-24 17:13:59 +0100)

----------------------------------------------------------------
Fix persistent register offsets of altera_edac, from Thor Thayer.

----------------------------------------------------------------
Thor Thayer (1):
      EDAC, altera: Fix S10 persistent register offset

 drivers/edac/altera_edac.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/edac/altera_edac.h b/drivers/edac/altera_edac.h
index 4213cb0bb2a7..f8664bac9fa8 100644
--- a/drivers/edac/altera_edac.h
+++ b/drivers/edac/altera_edac.h
@@ -295,8 +295,8 @@ struct altr_sdram_mc_data {
 #define S10_SYSMGR_ECC_INTSTAT_DERR_OFST  0xA0
 
 /* Sticky registers for Uncorrected Errors */
-#define S10_SYSMGR_UE_VAL_OFST            0x120
-#define S10_SYSMGR_UE_ADDR_OFST           0x124
+#define S10_SYSMGR_UE_VAL_OFST            0x220
+#define S10_SYSMGR_UE_ADDR_OFST           0x224
 
 #define S10_DDR0_IRQ_MASK                 BIT(16)
 

-- 
Regards/Gruss,
    Boris.

SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [GIT PULL] EDAC fix for 5.0
  2019-01-27 11:41 [GIT PULL] EDAC fix for 5.0 Borislav Petkov
@ 2019-01-27 19:05 ` pr-tracker-bot
  0 siblings, 0 replies; 2+ messages in thread
From: pr-tracker-bot @ 2019-01-27 19:05 UTC (permalink / raw)
  To: Borislav Petkov; +Cc: Linus Torvalds, linux-edac, lkml

The pull request you sent on Sun, 27 Jan 2019 12:41:54 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git tags/edac_fix_for_5.0

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/983542434e6beef911d5ae4488c49080a177e5e4

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-01-27 19:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-27 11:41 [GIT PULL] EDAC fix for 5.0 Borislav Petkov
2019-01-27 19:05 ` pr-tracker-bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).