linux-kernel - linux-next: manual merge of the hid tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20230815115325.0d20b960@canb.auug.org.au>
Date:   Tue, 15 Aug 2023 11:53:25 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jiri Kosina <jikos@...nel.org>,
        Benjamin Tissoires <benjamin.tissoires@...hat.com>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Bjorn Andersson <quic_bjorande@...cinc.com>,
        David Rheinsberg <david@...dahead.eu>,
        Jiri Kosina <jkosina@...e.cz>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the hid tree with Linus' tree

Hi all,

Today's linux-next merge of the hid tree got a conflict in:

  .mailmap

between commit:

  286812b041cc ("mailmap: update remaining active codeaurora.org email addresses")

from Linus' tree and commit:

  0c4b9411f363 ("MAINTAINERS: update my email address")

from the hid tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc .mailmap
index 5dd318121982,cea699139e6d..000000000000
--- a/.mailmap
+++ b/.mailmap
@@@ -138,10 -119,10 +138,13 @@@ Daniel Borkmann <daniel@...earbox.net> 
  Daniel Borkmann <daniel@...earbox.net> <dborkman@...hat.com>
  Daniel Borkmann <daniel@...earbox.net> <dxchgb@...il.com>
  David Brownell <david-b@...bell.net>
 +David Collins <quic_collinsd@...cinc.com> <collinsd@...eaurora.org>
+ David Rheinsberg <david@...dahead.eu> <dh.herrmann@...il.com>
+ David Rheinsberg <david@...dahead.eu> <dh.herrmann@...glemail.com>
+ David Rheinsberg <david@...dahead.eu> <david.rheinsberg@...il.com>
  David Woodhouse <dwmw2@...nybook.infradead.org>
 +Dedy Lansky <quic_dlansky@...cinc.com> <dlansky@...eaurora.org>
 +Deepak Kumar Singh <quic_deesin@...cinc.com> <deesin@...eaurora.org>
  Dengcheng Zhu <dzhu@...ecomp.com> <dczhu@...s.com>
  Dengcheng Zhu <dzhu@...ecomp.com> <dengcheng.zhu@...il.com>
  Dengcheng Zhu <dzhu@...ecomp.com> <dengcheng.zhu@...tec.com>

Content of type "application/pgp-signature" skipped