Skip to contentSkip to conversation

mailmap update for v5.9-rc2

GIT PULL Merged Kees Cook 3 participants 4 messages Aug 17, 2020 – Aug 18, 2020

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

Hi Linus,

Please pull this mailmap update for v5.9-rc2. This was originally part of my pstore tree, but when I realized that mailmap needed re-alphabetizing, I decided to wait until -rc1 to send this, as I saw a lot of mailmap additions pending in -next for the merge window. It's a programmatic reordering and the addition of a pstore contributor's preferred email address.

Thanks!

-Kees

The following changes since commit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5:

Linux 5.9-rc1 (2020-08-16 13:04:57 -0700)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git tags/pstore-v5.9-rc2

for you to fetch changes up to 5a4fe0624687e62919a5913dc7c937fbfcf61fdc:

mailmap: Add WeiXiong Liao (2020-08-17 14:32:44 -0700)

----------------------------------------------------------------
mailmap alphabetizing and addition

----------------------------------------------------------------
Kees Cook (2):
mailmap: Restore dictionary sorting
mailmap: Add WeiXiong Liao

 .mailmap | 115 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 58 insertions(+), 57 deletions(-)
Signature · 1 line
Kees Cook
#1 lore raw
Quoted 4 lines · Kees Cook

It's a programmatic
reordering and the addition of a pstore contributor's preferred email address.

Hmm.

I pulled this, looked at your script, and went "that's not right".

If you want dictionary sorting you'd use "sort -d".

But the commit message says "sort -f".

Looking at the *actual* ordering, you do seem to have actually used "-d". Or I'm very confused.

The end result looks ok, I'm just confused by that alleged script.

Linus

author
#2 lore raw
Quoted 3 lines · Linus Torvalds

If you want dictionary sorting you'd use "sort -d".

But the commit message says "sort -f".

O_o Err, I don't know how that happened. I must have cut/pasted into the commit log from my command history at the wrong place or something. Sorry about that and thanks for the pull!

Signature · 1 line
Kees Cook
merge bot Merged
#3 lore raw
In reply to Kees Cook
The pull request you sent on Mon, 17 Aug 2020 16:27:03 -0700:

The pull request you sent on Mon, 17 Aug 2020 16:27:03 -0700:

Quoted 1 line

https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git tags/pstore-v5.9-rc2

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/06a4ec1d9dc652e17ee3ac2ceb6c7cf6c2b75cdd

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html