diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 20:36:20 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 20:36:20 -0800 |
commit | d870a9d5e31ea69a1ceb7555d0d79364c442c5c0 (patch) | |
tree | ec20ff8bae64ceb35e86f44b1f30155b5d418693 /MAINTAINERS | |
parent | 2634bf2550f4dd7d2d4373725dbe4c4d2a6499fd (diff) | |
parent | 1cac5503fbf751f121d0c9f96e69d1fdd3eb1471 (diff) |
Merge tag 'edac_for_4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC updates from Borislav Petkov:
- hide EDAC workqueue from users (Borislav Petkov)
- edac_subsys init/teardown cleanup (Borislav Petkov)
- make mpc85xx-pci-edac a platform device (Scott Wood)
- sb_edac KNL gen2 support (Jim Snow)
- other small cleanups all over the place
* tag 'edac_for_4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
EDAC, i5100: Use to_delayed_work()
MAINTAINERS: Fix EDAC repo URLs format
EDAC, sb_edac: Set fixed DIMM width on Xeon Knights Landing
EDAC: Rework workqueue handling
EDAC: Make edac_device workqueue setup/teardown functions static
EDAC: Remove edac_get_sysfs_subsys() error handling
EDAC: Unexport and make edac_subsys static
EDAC: Rip out the edac_subsys reference counting
EDAC: Robustify workqueues destruction
EDAC, mc_sysfs: Fix freeing bus' name
EDAC, mpc85xx: Make mpc85xx-pci-edac a platform device
EDAC, sb_edac: Add Knights Landing (Xeon Phi gen 2) support
EDAC, sb_edac: Add support for duplicate device IDs
EDAC, sb_edac: Virtualize several hard-coded functions
EDAC, mv64x60: Use platform_register/unregister_drivers()
EDAC, mpc85xx: Use platform_register/unregister_drivers()
EDAC: Add DDR4 flag
EDAC: Remove references to bluesmoke.sourceforge.net
EDAC, pci: Remove old disabled code
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cbfb81b5ced5..ab8695d6e75c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3933,9 +3933,8 @@ M: Doug Thompson <dougthompson@xmission.com> M: Borislav Petkov <bp@alien8.de> M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net -T: git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next -T: git://git.kernel.org/pub/linux/kernel/git/mchehab/linux-edac.git#linux_next +T: git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next S: Supported F: Documentation/edac.txt F: drivers/edac/ @@ -3945,7 +3944,6 @@ EDAC-AMD64 M: Doug Thompson <dougthompson@xmission.com> M: Borislav Petkov <bp@alien8.de> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/amd64_edac* @@ -3953,7 +3951,6 @@ EDAC-CALXEDA M: Doug Thompson <dougthompson@xmission.com> M: Robert Richter <rric@kernel.org> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/highbank* @@ -3962,7 +3959,6 @@ M: Ralf Baechle <ralf@linux-mips.org> M: David Daney <david.daney@cavium.com> L: linux-edac@vger.kernel.org L: linux-mips@linux-mips.org -W: bluesmoke.sourceforge.net S: Supported F: drivers/edac/octeon_edac* @@ -3970,63 +3966,54 @@ EDAC-E752X M: Mark Gross <mark.gross@intel.com> M: Doug Thompson <dougthompson@xmission.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/e752x_edac.c EDAC-E7XXX M: Doug Thompson <dougthompson@xmission.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/e7xxx_edac.c EDAC-GHES M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/ghes_edac.c EDAC-I82443BXGX M: Tim Small <tim@buttersideup.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/i82443bxgx_edac.c EDAC-I3000 M: Jason Uhlenkott <juhlenko@akamai.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/i3000_edac.c EDAC-I5000 M: Doug Thompson <dougthompson@xmission.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/i5000_edac.c EDAC-I5400 M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/i5400_edac.c EDAC-I7300 M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/i7300_edac.c EDAC-I7CORE M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/i7core_edac.c @@ -4034,42 +4021,36 @@ EDAC-I82975X M: Ranganathan Desikan <ravi@jetztechnologies.com> M: "Arvind R." <arvino55@gmail.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/i82975x_edac.c EDAC-IE31200 M: Jason Baron <jbaron@akamai.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/ie31200_edac.c EDAC-MPC85XX M: Johannes Thumshirn <morbidrsa@gmail.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/mpc85xx_edac.[ch] EDAC-PASEMI M: Egor Martovetsky <egor@pasemi.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/pasemi_edac.c EDAC-R82600 M: Tim Small <tim@buttersideup.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/r82600_edac.c EDAC-SBRIDGE M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> L: linux-edac@vger.kernel.org -W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/sb_edac.c |