Merge branch ‘parisc-5.0-1’ of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux [Linux 5.0]

Merge branch ‘parisc-5.0-1’ of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux [Linux 5.0]

This Linux kernel change "Merge branch ‘parisc-5.0-1’ of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux" is included in the Linux 5.0 release. This change is authored by Linus Torvalds <torvalds [at] linux-foundation.org> on Fri Feb 22 16:12:01 2019 -0800. The commit for this change in Linux stable tree is 8456e98 (patch). Other info about this change: Merge: 77dc118 71d73a0

Merge branch 'parisc-5.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc fixes from Helge Deller:
 "Fix ptrace syscall number modification which has been broken since
  kernel v4.5 and provide alternative email addresses for the remaining
  users of the retired parisc-linux.org email domain"

* 'parisc-5.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  CREDITS/MAINTAINERS: Retire parisc-linux.org email domain
  parisc: Fix ptrace syscall number modification

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 CREDITS     | 20 +++++++++-----------
 MAINTAINERS |  5 ++---
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/CREDITS b/CREDITS
index e818eb6..0175098 100644
--- a/CREDITS
+++ b/CREDITS
@@ -842,10 +842,9 @@ D: ax25-utils maintainer.

 N: Helge Deller
 E: [email protected]
-E: [email protected]
-D: PA-RISC Linux hacker, LASI-, ASP-, WAX-, LCD/LED-driver
-S: Schimmelsrain 1
-S: D-69231 Rauenberg
+W: http://www.parisc-linux.org/
+D: PA-RISC Linux architecture maintainer
+D: LASI-, ASP-, WAX-, LCD/LED-driver
 S: Germany

 N: Jean Delvare
@@ -1361,7 +1360,7 @@ S: Stellenbosch, Western Cape
 S: South Africa

 N: Grant Grundler
-E: [email protected]
+E: [email protected]
 W: http://obmouse.sourceforge.net/
 W: http://www.parisc-linux.org/
 D: obmouse - rewrote Olivier Florent's Omnibook 600 "pop-up" mouse driver
@@ -2492,7 +2491,7 @@ S: Syracuse, New York 13206
 S: USA

 N: Kyle McMartin
-E: [email protected]
+E: [email protected]
 D: Linux/PARISC hacker
 D: AD1889 sound driver
 S: Ottawa, Canada
@@ -3780,14 +3779,13 @@ S: 21513 Conradia Ct
 S: Cupertino, CA 95014
 S: USA

-N: Thibaut Varene
-E: [email protected]
-W: http://www.parisc-linux.org/~varenet/
-P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C  FA2F 1E32 C3DA B7D2 F063
+N: Thibaut Varène
+E: [email protected]
+W: http://hacks.slashdirt.org/
 D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits
 D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there
 D: AD1889 sound driver
-S: Paris, France
+S: France

 N: Heikki Vatiainen
 E: [email protected]
diff --git a/MAINTAINERS b/MAINTAINERS
index 41ce5f4..e6e17d8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -409,8 +409,7 @@ F:  drivers/platform/x86/wmi.c
 F: include/uapi/linux/wmi.h

 AD1889 ALSA SOUND DRIVER
-M: Thibaut Varene <[email protected]>
-W: http://wiki.parisc-linux.org/AD1889
+W: https://parisc.wiki.kernel.org/index.php/AD1889
 L: [email protected]
 S: Maintained
 F: sound/pci/ad1889.*
@@ -11488,7 +11487,7 @@ F:  Documentation/blockdev/paride.txt
 F: drivers/block/paride/

 PARISC ARCHITECTURE
-M: "James E.J. Bottomley" <[email protected]>
+M: "James E.J. Bottomley" <[email protected]>
 M: Helge Deller <[email protected]>
 L: [email protected]
 W: http://www.parisc-linux.org/

Leave a Reply

Your email address will not be published. Required fields are marked *