[alternative-merged] proc-fix-up-copyright-symbol.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: proc: fix up copyright symbol
has been removed from the -mm tree.  Its filename was
     proc-fix-up-copyright-symbol.patch

This patch was dropped because an alternative patch was merged

------------------------------------------------------
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Subject: proc: fix up copyright symbol

Andrew's sylpheed butchered it :-(

Add copyright in two files before they get autorubberstamped.

Link: http://lkml.kernel.org/r/20180411201950.GA12904@avx2
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 tools/testing/selftests/proc/proc-loadavg-001.c        |    2 -
 tools/testing/selftests/proc/proc-self-map-files-001.c |    2 -
 tools/testing/selftests/proc/proc-self-map-files-002.c |    2 -
 tools/testing/selftests/proc/proc-self-syscall.c       |   15 ++++++++++
 tools/testing/selftests/proc/proc-self-wchan.c         |   15 ++++++++++
 tools/testing/selftests/proc/proc-uptime-001.c         |    2 -
 tools/testing/selftests/proc/proc-uptime-002.c         |    2 -
 tools/testing/selftests/proc/proc-uptime.h             |    2 -
 tools/testing/selftests/proc/read.c                    |    2 -
 9 files changed, 37 insertions(+), 7 deletions(-)

diff -puN tools/testing/selftests/proc/proc-loadavg-001.c~proc-fix-up-copyright-symbol tools/testing/selftests/proc/proc-loadavg-001.c
--- a/tools/testing/selftests/proc/proc-loadavg-001.c~proc-fix-up-copyright-symbol
+++ a/tools/testing/selftests/proc/proc-loadavg-001.c
@@ -1,5 +1,5 @@
 /*
- * Copyright _ 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
+ * Copyright � 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff -puN tools/testing/selftests/proc/proc-self-map-files-001.c~proc-fix-up-copyright-symbol tools/testing/selftests/proc/proc-self-map-files-001.c
--- a/tools/testing/selftests/proc/proc-self-map-files-001.c~proc-fix-up-copyright-symbol
+++ a/tools/testing/selftests/proc/proc-self-map-files-001.c
@@ -1,5 +1,5 @@
 /*
- * Copyright _ 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
+ * Copyright � 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff -puN tools/testing/selftests/proc/proc-self-map-files-002.c~proc-fix-up-copyright-symbol tools/testing/selftests/proc/proc-self-map-files-002.c
--- a/tools/testing/selftests/proc/proc-self-map-files-002.c~proc-fix-up-copyright-symbol
+++ a/tools/testing/selftests/proc/proc-self-map-files-002.c
@@ -1,5 +1,5 @@
 /*
- * Copyright _ 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
+ * Copyright � 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff -puN tools/testing/selftests/proc/proc-self-syscall.c~proc-fix-up-copyright-symbol tools/testing/selftests/proc/proc-self-syscall.c
--- a/tools/testing/selftests/proc/proc-self-syscall.c~proc-fix-up-copyright-symbol
+++ a/tools/testing/selftests/proc/proc-self-syscall.c
@@ -1,3 +1,18 @@
+/*
+ * Copyright � 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
 #define _GNU_SOURCE
 #include <unistd.h>
 #include <sys/syscall.h>
diff -puN tools/testing/selftests/proc/proc-self-wchan.c~proc-fix-up-copyright-symbol tools/testing/selftests/proc/proc-self-wchan.c
--- a/tools/testing/selftests/proc/proc-self-wchan.c~proc-fix-up-copyright-symbol
+++ a/tools/testing/selftests/proc/proc-self-wchan.c
@@ -1,3 +1,18 @@
+/*
+ * Copyright � 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff -puN tools/testing/selftests/proc/proc-uptime-001.c~proc-fix-up-copyright-symbol tools/testing/selftests/proc/proc-uptime-001.c
--- a/tools/testing/selftests/proc/proc-uptime-001.c~proc-fix-up-copyright-symbol
+++ a/tools/testing/selftests/proc/proc-uptime-001.c
@@ -1,5 +1,5 @@
 /*
- * Copyright _ 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
+ * Copyright � 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff -puN tools/testing/selftests/proc/proc-uptime-002.c~proc-fix-up-copyright-symbol tools/testing/selftests/proc/proc-uptime-002.c
--- a/tools/testing/selftests/proc/proc-uptime-002.c~proc-fix-up-copyright-symbol
+++ a/tools/testing/selftests/proc/proc-uptime-002.c
@@ -1,5 +1,5 @@
 /*
- * Copyright _ 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
+ * Copyright � 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff -puN tools/testing/selftests/proc/proc-uptime.h~proc-fix-up-copyright-symbol tools/testing/selftests/proc/proc-uptime.h
--- a/tools/testing/selftests/proc/proc-uptime.h~proc-fix-up-copyright-symbol
+++ a/tools/testing/selftests/proc/proc-uptime.h
@@ -1,5 +1,5 @@
 /*
- * Copyright _ 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
+ * Copyright � 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff -puN tools/testing/selftests/proc/read.c~proc-fix-up-copyright-symbol tools/testing/selftests/proc/read.c
--- a/tools/testing/selftests/proc/read.c~proc-fix-up-copyright-symbol
+++ a/tools/testing/selftests/proc/read.c
@@ -1,5 +1,5 @@
 /*
- * Copyright _ 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
+ * Copyright � 2018 Alexey Dobriyan <adobriyan@xxxxxxxxx>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
_

Patches currently in -mm which might be from adobriyan@xxxxxxxxx are

proc-fixup-copyright-sign.patch
proc-revalidate-misc-dentries.patch
coredump-fix-spam-with-zero-vma-process.patch
seq_file-delete-small-value-optimization.patch

��.n��������+%������w��{.n����������ܨ}���Ơz�j:+v�����w����ޙ��&�)ߡ�a����z�ޗ���ݢj��w�f




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux