From: akpm@linux-foundation.org
To: akpm@linux-foundation.org, mm-commits@vger.kernel.org
Subject: + linux-next-git-rejects.patch added to -mm tree
Date: Wed, 07 Feb 2018 11:54:46 -0800 [thread overview]
Message-ID: <20180207195446.hQGbdYKSw%akpm@linux-foundation.org> (raw)
The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
Documentation/process/maintainer-pgp-guide.rst | 58 ---------------
drivers/platform/x86/dell-laptop.c | 3
2 files changed, 61 deletions(-)
diff -puN Documentation/process/maintainer-pgp-guide.rst~linux-next-git-rejects Documentation/process/maintainer-pgp-guide.rst
--- a/Documentation/process/maintainer-pgp-guide.rst~linux-next-git-rejects
+++ a/Documentation/process/maintainer-pgp-guide.rst
@@ -18,17 +18,10 @@ The role of PGP in Linux Kernel developm
===========================================
PGP helps ensure the integrity of the code that is produced by the Linux
-<<<<<<< HEAD
-kernel development community and, to a lesser degree, establish trusted
-communication channels between developers via PGP-signed email exchange.
-
-The Linux kernel source code is available in two main formats:
-=======
Kernel development community and, to a lesser degree, establish trusted
communication channels between developers via PGP-signed email exchange.
The Linux Kernel source code is available in two main formats:
->>>>>>> linux-next/akpm-base
- Distributed source repositories (git)
- Periodic release snapshots (tarballs)
@@ -60,11 +53,7 @@ want to make sure that by placing trust
shift the blame for potential future security incidents to someone else.
The goal is to provide a set of guidelines developers can use to create
a secure working environment and safeguard the PGP keys used to
-<<<<<<< HEAD
-establish the integrity of the Linux kernel itself.
-=======
establish the integrity of the Linux Kernel itself.
->>>>>>> linux-next/akpm-base
.. _pgp_tools:
@@ -150,11 +139,7 @@ Protect your master PGP key
===========================
This guide assumes that you already have a PGP key that you use for Linux
-<<<<<<< HEAD
-kernel development purposes. If you do not yet have one, please see the
-=======
Kernel development purposes. If you do not yet have one, please see the
->>>>>>> linux-next/akpm-base
"`Protecting Code Integrity`_" document mentioned earlier for guidance
on how to create a new one.
@@ -164,13 +149,7 @@ You should also make a new key if your c
Master key vs. Subkeys
----------------------
-<<<<<<< HEAD
-Subkeys are fully independent PGP keypairs that are tied to the "master"
-key using certifying key signatures (certificates). It is important to
-understand the following:
-=======
It is important to understand the following:
->>>>>>> linux-next/akpm-base
1. There are no technical differences between the "master key" and "subkeys."
2. At creation time, we assign functional limitations to each key by
@@ -763,31 +742,6 @@ How to work with signed commits
-------------------------------
It is easy to create signed commits, but it is much more difficult to
-<<<<<<< HEAD
-use them in Linux kernel development, since it relies on patches sent to
-the mailing list, and this workflow does not preserve PGP commit
-signatures. Furthermore, when rebasing your repository to match
-upstream, even your own PGP commit signatures will end up discarded. For
-this reason, most kernel developers don't bother signing their commits
-and will ignore signed commits in any external repositories that they
-rely upon in their work.
-
-However, if you have your working git tree publicly available at some
-git hosting service (kernel.org, infradead.org, ozlabs.org, or others),
-then the recommendation is that you sign all your git commits even if
-upstream developers do not directly benefit from this practice.
-
-We recommend this for the following reasons:
-
-1. Should there ever be a need to perform code forensics or track code
- provenance, even externally maintained trees carrying PGP commit
- signatures will be valuable for such purposes.
-2. If you ever need to re-clone your local repository (for example,
- after a disk failure), this lets you easily verify the repository
- integrity before resuming your work.
-3. If someone needs to cherry-pick your commits, this allows them to
- quickly verify their integrity before applying them.
-=======
use them in Linux Kernel development, since it relies on patches sent to
the mailing list, and this workflow does not preserve PGP commit
signatures.
@@ -799,7 +753,6 @@ developers do not directly benefit from
be a need to perform code forensics or track code provenance, even
externally maintained trees carrying PGP commit signatures will be
extremely valuable for such purposes.
->>>>>>> linux-next/akpm-base
Creating signed commits
~~~~~~~~~~~~~~~~~~~~~~~
@@ -817,13 +770,6 @@ You can tell git to always sign commits:
git config --global commit.gpgSign true
-<<<<<<< HEAD
-.. note::
-
- Make sure you configure ``gpg-agent`` before you turn this on.
-
-=======
->>>>>>> linux-next/akpm-base
.. _verify_identities:
How to verify kernel developer identities
@@ -936,11 +882,7 @@ Locate the ID of the master key in the o
``C94035C21B4F2AEB``. Now display the key of Linus Torvalds that you
have on your keyring::
-<<<<<<< HEAD
- $ gpg --list-key torvalds@kernel.org
-=======
$ git --list-key torvalds@kernel.org
->>>>>>> linux-next/akpm-base
pub rsa2048 2011-09-20 [SC]
ABAF11C65A2970B130ABE3C479BE3E4300411886
uid [ unknown] Linus Torvalds <torvalds@kernel.org>
diff -puN drivers/platform/x86/dell-laptop.c~linux-next-git-rejects drivers/platform/x86/dell-laptop.c
--- a/drivers/platform/x86/dell-laptop.c~linux-next-git-rejects
+++ a/drivers/platform/x86/dell-laptop.c
@@ -1217,12 +1217,9 @@ static int kbd_get_info(struct kbd_info
info->triggers = buffer.output[2] & 0xFF;
units = (buffer.output[2] >> 8) & 0xFF;
info->levels = (buffer.output[2] >> 16) & 0xFF;
-<<<<<<< HEAD
-=======
if (quirks && quirks->kbd_led_levels_off_1 && info->levels)
info->levels--;
->>>>>>> linux-next/akpm-base
if (quirks && quirks->kbd_led_levels_off_1 && info->levels)
info->levels--;
_
Patches currently in -mm which might be from akpm@linux-foundation.org are
i-need-old-gcc.patch
include-linux-sched-mmh-re-inline-mmdrop.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
fs-elf-drop-map_fixed-usage-from-elf_map-checkpatch-fixes.patch
mm-migrate-remove-reason-argument-from-new_page_t-fix-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
next reply other threads:[~2018-02-07 19:54 UTC|newest]
Thread overview: 431+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-07 19:54 akpm [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-04-24 20:17 + linux-next-git-rejects.patch added to -mm tree Andrew Morton
2022-04-15 18:36 Andrew Morton
2022-04-13 2:43 Andrew Morton
2022-04-08 17:44 Andrew Morton
2022-04-05 18:14 Andrew Morton
2022-03-31 21:10 Andrew Morton
2022-03-11 1:19 Andrew Morton
2022-03-06 22:08 Andrew Morton
2022-03-03 21:56 Andrew Morton
2022-02-25 4:05 Andrew Morton
2022-02-04 5:44 Andrew Morton
2022-01-13 0:47 akpm
2022-01-07 22:23 akpm
2021-12-21 21:18 akpm
2021-12-10 16:38 akpm
2021-12-03 17:30 akpm
2021-11-18 21:17 akpm
2021-10-28 18:58 akpm
2021-10-22 18:01 akpm
2021-10-10 20:42 akpm
2021-10-06 1:48 akpm
2021-09-27 23:28 akpm
2021-09-19 18:13 akpm
2021-09-14 1:16 akpm
2021-08-31 18:05 akpm
2021-08-12 20:39 akpm
2021-08-05 23:03 akpm
2021-08-01 19:11 akpm
2021-06-24 20:21 akpm
2021-06-08 20:11 akpm
2021-06-04 19:22 akpm
2021-05-31 21:23 akpm
2021-05-20 6:24 akpm
2021-05-08 22:38 akpm
2021-04-30 0:18 akpm
2021-04-23 18:47 akpm
2021-04-16 17:13 akpm
2021-04-15 1:10 akpm
2021-04-11 22:48 akpm
2021-03-31 20:57 akpm
2021-03-28 22:26 akpm
2021-03-18 23:47 akpm
2021-03-16 19:10 akpm
2021-03-12 5:30 akpm
2021-03-10 17:05 akpm
2021-03-05 23:05 akpm
2021-02-23 21:06 akpm
2021-02-04 23:55 akpm
2021-01-28 20:12 akpm
2021-01-25 21:34 akpm
2021-01-17 18:53 akpm
2021-01-07 22:33 akpm
2020-12-23 18:27 akpm
2020-12-16 17:06 akpm
2020-12-02 21:38 akpm
2020-11-25 20:33 akpm
2020-11-20 19:12 akpm
2020-11-08 2:07 akpm
2020-10-30 22:58 akpm
2020-10-09 21:42 akpm
2020-10-02 23:36 akpm
2020-09-26 1:47 akpm
2020-09-04 17:45 akpm
2020-08-30 19:58 akpm
2020-08-22 17:29 akpm
2020-07-28 20:26 akpm
2020-07-24 23:37 akpm
2020-07-23 3:18 akpm
2020-07-15 23:54 akpm
2020-07-10 20:31 akpm
2020-06-26 3:28 incoming Andrew Morton
2020-06-27 3:32 ` + linux-next-git-rejects.patch added to -mm tree Andrew Morton
2020-06-20 19:37 akpm
2020-06-05 20:00 akpm
2020-06-02 18:28 akpm
2020-06-01 22:04 akpm
2020-05-24 23:17 akpm
2020-05-07 16:54 akpm
2020-04-25 22:55 akpm
2020-04-22 0:55 akpm
2020-04-09 0:08 akpm
2020-04-06 21:37 akpm
2020-04-01 1:07 akpm
2020-03-26 18:15 akpm
2020-03-21 19:39 akpm
2020-03-13 20:56 akpm
2020-03-11 21:19 akpm
2020-03-06 1:20 akpm
2020-02-27 21:31 akpm
2020-02-19 19:16 akpm
2020-02-10 21:58 akpm
2020-02-11 9:04 ` Thomas Gleixner
2020-01-30 18:06 akpm
2020-01-25 2:20 akpm
2020-01-22 19:42 akpm
2020-01-14 22:49 akpm
2020-01-10 20:34 akpm
2018-02-16 20:23 akpm
2018-02-05 22:47 akpm
2018-02-01 0:31 akpm
2018-01-22 20:10 akpm
2018-01-12 21:44 akpm
2018-01-09 20:12 akpm
2018-01-04 21:54 akpm
2017-12-21 20:04 akpm
2017-12-15 21:38 akpm
2017-12-13 22:25 akpm
2017-11-30 20:17 akpm
2017-11-21 20:04 akpm
2017-11-09 19:50 akpm
2017-11-02 19:46 akpm
2017-10-18 19:20 akpm
2017-10-13 20:25 akpm
2017-10-02 18:48 akpm
2017-09-13 22:30 akpm
2017-09-07 18:36 akpm
2017-09-05 19:51 akpm
2017-08-23 19:57 akpm
2017-08-18 19:51 akpm
2017-08-04 21:17 akpm
2017-08-01 19:36 akpm
2017-07-28 20:37 akpm
2017-07-18 19:26 akpm
2017-07-05 19:38 akpm
2017-06-29 19:33 akpm
2017-06-15 17:16 akpm
2017-06-01 19:42 akpm
2017-05-12 19:35 akpm
2017-05-10 17:58 akpm
2017-04-26 21:44 akpm
2017-04-13 19:20 akpm
2017-04-06 21:02 akpm
2017-04-03 19:07 akpm
2017-03-30 20:34 akpm
2017-03-16 23:18 akpm
2017-02-28 20:49 akpm
2017-02-21 19:31 akpm
2017-02-07 21:01 akpm
2017-02-03 20:04 akpm
2017-02-01 21:18 akpm
2017-01-26 21:14 akpm
2017-01-20 22:03 akpm
2017-01-17 19:28 akpm
2017-01-11 22:27 akpm
2017-01-06 23:25 akpm
2016-12-14 23:23 akpm
2016-12-07 23:43 akpm
2016-12-05 19:01 akpm
2016-11-22 21:49 akpm
2016-11-14 20:01 akpm
2016-10-28 18:33 akpm
2016-10-21 20:13 akpm
2016-10-11 20:58 akpm
2016-10-04 19:43 akpm
2016-09-12 20:25 akpm
2016-08-29 19:53 akpm
2016-08-18 21:01 akpm
2016-08-15 20:40 akpm
2016-08-09 19:28 akpm
2016-07-26 22:39 akpm
2016-07-08 21:33 akpm
2016-06-24 19:23 akpm
2016-06-16 20:26 akpm
2016-06-10 19:11 akpm
2016-06-01 17:49 akpm
2016-05-26 18:10 akpm
2016-05-24 17:49 akpm
2016-05-20 0:20 akpm
2016-05-05 19:47 akpm
2016-05-02 17:49 akpm
2016-04-27 22:09 akpm
2016-03-15 17:50 akpm
2016-03-10 18:57 akpm
2016-03-08 22:09 akpm
2016-02-24 21:56 akpm
2016-02-11 20:38 akpm
2016-02-09 0:39 akpm
2016-02-02 0:55 akpm
2016-01-12 23:28 akpm
2016-01-07 22:15 akpm
2015-12-28 21:10 akpm
2015-12-04 0:49 akpm
2015-11-25 23:04 akpm
2015-10-30 19:44 akpm
2015-10-14 19:43 akpm
2015-10-02 19:35 akpm
2015-09-21 18:23 akpm
2015-08-21 20:00 akpm
2015-08-17 21:16 akpm
2015-08-03 19:23 akpm
2015-07-23 20:13 akpm
2015-07-17 20:58 akpm
2015-07-01 20:37 akpm
2015-06-25 19:05 akpm
2015-06-23 19:22 akpm
2015-06-16 18:59 akpm
2015-06-02 18:26 akpm
2015-05-22 20:07 akpm
2015-05-13 19:51 akpm
2015-05-05 22:28 akpm
2015-04-24 17:04 akpm
2015-04-22 18:04 akpm
2015-04-03 19:11 akpm
2015-03-25 19:23 akpm
2015-03-23 19:25 akpm
2015-03-04 23:43 akpm
2015-02-18 23:32 akpm
2015-02-06 21:06 akpm
2015-01-27 20:22 akpm
2015-01-16 21:22 akpm
2014-12-18 1:07 akpm
2014-12-15 20:35 akpm
2014-12-04 22:36 akpm
2014-11-26 20:38 akpm
2014-11-10 21:40 akpm
2014-10-13 19:43 akpm
2014-10-02 19:23 akpm
2014-09-29 20:21 akpm
2014-08-01 18:54 akpm
2014-07-30 20:19 akpm
2014-07-22 19:31 akpm
2014-07-16 20:31 akpm
2014-07-09 19:36 akpm
2014-06-26 19:15 akpm
2014-06-10 19:48 akpm
2014-06-02 19:10 akpm
2014-05-20 18:15 akpm
2014-05-13 18:53 akpm
2014-04-21 18:10 akpm
2014-04-09 17:54 akpm
2014-04-04 23:01 akpm
2014-04-02 19:58 akpm
2014-03-21 19:08 akpm
2014-03-18 20:22 akpm
2014-03-10 18:48 akpm
2014-02-19 23:04 akpm
2014-02-11 19:22 akpm
2014-01-21 20:36 akpm
2013-12-26 21:16 akpm
2013-12-12 20:38 akpm
2013-12-09 21:51 akpm
2013-12-02 20:35 akpm
2013-11-22 21:21 akpm
2013-11-19 21:28 akpm
2013-11-07 19:02 akpm
2013-11-04 19:20 akpm
2013-09-25 19:03 akpm
2013-09-23 18:24 akpm
2013-08-23 18:57 akpm
2013-08-19 19:45 akpm
2013-08-08 19:21 akpm
2013-07-18 20:22 akpm
2013-07-09 21:04 akpm
2013-07-02 19:29 akpm
2013-06-27 20:05 akpm
2013-06-10 20:41 akpm
2013-06-05 19:15 akpm
2013-06-03 20:02 akpm
2013-05-29 19:00 akpm
2013-05-23 19:54 akpm
2013-05-10 18:42 akpm
2013-04-29 18:39 akpm
2013-04-09 19:42 akpm
2013-03-27 18:55 akpm
2013-03-25 19:33 akpm
2013-03-18 19:26 akpm
2013-03-08 20:08 akpm
2013-03-06 20:23 akpm
2013-02-20 20:38 akpm
2013-02-12 20:24 akpm
2013-01-24 22:37 akpm
2013-01-22 21:18 akpm
2013-01-17 20:49 akpm
2013-01-04 21:56 akpm
2012-12-20 20:13 akpm
2012-12-17 20:19 akpm
2012-12-12 22:31 akpm
2012-11-30 20:49 akpm
2012-11-19 20:19 akpm
2012-10-29 19:41 akpm
2012-10-24 22:10 akpm
2012-10-22 19:01 akpm
2012-10-17 21:16 akpm
2012-10-10 19:48 akpm
2012-10-05 20:09 akpm
2012-10-01 19:11 akpm
2012-09-13 18:18 akpm
2012-09-11 19:28 akpm
2012-09-06 19:12 akpm
2012-08-21 18:35 akpm
2012-08-14 19:47 akpm
2012-07-17 19:49 akpm
2012-07-13 19:48 akpm
2012-06-29 20:17 akpm
2012-06-19 18:24 akpm
2012-06-08 19:40 akpm
2012-06-01 19:39 akpm
2012-05-23 23:09 akpm
2012-05-22 22:41 akpm
2012-05-09 20:38 akpm
2012-05-04 19:18 akpm
2012-04-20 18:47 akpm
2012-03-29 19:11 akpm
2012-03-22 19:42 akpm
2012-03-20 19:11 akpm
2012-03-15 22:51 akpm
2012-03-12 22:18 akpm
2012-03-02 21:59 akpm
2012-02-24 21:15 akpm
2012-02-14 20:20 akpm
2012-02-08 19:57 akpm
2012-01-31 20:10 akpm
2012-01-26 23:01 akpm
2012-01-24 22:23 akpm
2012-01-24 22:19 akpm
2012-01-12 0:16 akpm
2012-01-06 21:01 akpm
2011-12-15 20:57 akpm
2011-12-09 19:57 akpm
2011-12-01 20:31 akpm
2011-11-28 20:57 akpm
2011-11-21 20:28 akpm
2011-11-17 20:19 akpm
2011-08-26 19:05 akpm
2011-08-19 20:46 akpm
2011-08-03 18:57 akpm
2011-07-26 7:51 akpm
2011-07-25 19:14 akpm
2011-07-08 18:13 akpm
2011-07-06 19:20 akpm
2011-06-22 18:34 akpm
2011-06-08 19:52 akpm
2011-05-26 19:39 akpm
2011-05-24 18:53 akpm
2011-05-18 18:24 akpm
2011-05-12 18:49 akpm
2011-05-06 19:53 akpm
2011-05-02 19:18 akpm
2011-04-26 18:37 akpm
2011-04-13 19:15 akpm
2011-03-28 20:39 akpm
2011-03-23 20:30 akpm
2011-03-15 20:27 akpm
2011-02-22 22:13 akpm
2011-01-25 23:25 akpm
2011-01-13 19:54 akpm
2011-01-10 21:28 akpm
2010-12-21 20:48 akpm
2010-12-17 22:24 akpm
2010-12-02 21:05 akpm
2010-11-08 19:57 akpm
2010-10-22 19:17 akpm
2010-10-14 20:05 akpm
2010-09-22 19:44 akpm
2010-09-10 21:48 akpm
2010-08-24 22:14 akpm
2010-08-10 19:44 akpm
2010-08-04 19:07 akpm
2010-07-21 19:03 akpm
2010-07-15 18:02 akpm
2010-07-08 19:08 akpm
2010-07-01 18:18 akpm
2010-05-28 18:48 akpm
2010-05-20 14:18 akpm
2010-05-11 21:02 akpm
2010-04-19 16:58 akpm
2010-04-01 15:05 akpm
2010-03-30 15:00 akpm
2010-03-19 16:47 akpm
2010-03-15 3:51 akpm
2010-03-03 19:54 akpm
2010-02-24 19:37 akpm
2010-02-10 23:20 akpm
2010-02-05 19:56 akpm
2010-01-27 21:35 akpm
2010-01-14 21:19 akpm
2009-12-18 20:24 akpm
2009-12-15 21:48 akpm
2009-12-10 20:20 akpm
2009-12-08 21:02 akpm
2009-11-25 18:52 akpm
2009-11-09 19:36 akpm
2009-10-09 21:59 akpm
2009-09-15 21:00 akpm
2009-09-10 4:47 akpm
2009-08-27 22:34 akpm
2009-08-21 20:51 akpm
2009-07-27 20:33 akpm
2009-07-05 18:33 akpm
2009-06-26 18:20 akpm
2009-06-23 19:28 akpm
2009-06-17 18:16 akpm
2009-06-10 17:40 akpm
2009-06-02 22:24 akpm
2009-05-29 18:41 akpm
2009-05-17 16:30 akpm
2009-04-24 19:26 akpm
2009-04-15 19:37 akpm
2009-04-10 20:07 akpm
2009-04-07 19:01 akpm
2009-03-31 18:54 akpm
2009-03-11 18:04 akpm
2009-03-09 23:02 akpm
2009-03-04 18:32 akpm
2009-02-23 21:51 akpm
2009-02-11 19:18 akpm
2009-02-09 19:43 akpm
2009-02-03 19:52 akpm
2009-01-27 19:13 akpm
2009-01-16 19:15 akpm
2008-12-30 19:53 akpm
2008-12-19 21:31 akpm
2008-12-16 19:49 akpm
2008-12-09 18:50 akpm
2008-12-03 23:23 akpm
2008-10-28 19:06 akpm
2008-09-22 6:53 akpm
2008-09-08 19:00 akpm
2008-09-02 20:14 akpm
2008-08-22 22:54 akpm
2008-08-19 22:42 akpm
2008-08-08 22:03 akpm
2008-07-30 19:06 akpm
2008-07-22 20:26 akpm
2008-07-04 6:32 akpm
2008-06-16 6:26 akpm
2008-06-08 19:40 akpm
2008-05-16 22:26 akpm
2008-05-14 21:21 akpm
2008-05-13 21:08 akpm
2008-05-13 2:09 akpm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180207195446.hQGbdYKSw%akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mm-commits@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.