Re: [GIT PULL] MIPS changes for v5.12-rc1

2021-02-21 Thread pr-tracker-bot
The pull request you sent on Fri, 19 Feb 2021 13:06:38 +0100: > git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git/ tags/mips_5.12 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/2671fe5e1d48fe2c14a46bdf8fd9d7b24f88c1e2 Thank you! -- Deet-doot-dot, I am a b

[GIT PULL] MIPS changes for v5.12-rc1

2021-02-19 Thread Thomas Bogendoerfer
Hi Linus, a test merge with v5.11 shows a conflict in .mailmap, which I resolved with diff --cc .mailmap index 7fdf87b24fe8,d942f9493a47..ade90fc9140a --- a/.mailmap +++ b/.mailmap @@@ -202,8 -200,7 +202,9 @@@ Li Yang Lukasz Luba Maciej W. Rozycki + Maciej W. Rozycki +Manivannan Sad