From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jikos@kernel•org>,
Benjamin Tissoires <benjamin.tissoires@redhat•com>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Bjorn Andersson <quic_bjorande@quicinc•com>,
David Rheinsberg <david@readahead•eu>,
Jiri Kosina <jkosina@suse•cz>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the hid tree with Linus' tree
Date: Tue, 15 Aug 2023 11:53:25 +1000 [thread overview]
Message-ID: <20230815115325.0d20b960@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1701 bytes --]
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@iogearbox•net>
Daniel Borkmann <daniel@iogearbox•net> <dborkman@redhat•com>
Daniel Borkmann <daniel@iogearbox•net> <dxchgb@gmail•com>
David Brownell <david-b@pacbell•net>
+David Collins <quic_collinsd@quicinc•com> <collinsd@codeaurora•org>
+ David Rheinsberg <david@readahead•eu> <dh.herrmann@gmail•com>
+ David Rheinsberg <david@readahead•eu> <dh.herrmann@googlemail•com>
+ David Rheinsberg <david@readahead•eu> <david.rheinsberg@gmail•com>
David Woodhouse <dwmw2@shinybook•infradead.org>
+Dedy Lansky <quic_dlansky@quicinc•com> <dlansky@codeaurora•org>
+Deepak Kumar Singh <quic_deesin@quicinc•com> <deesin@codeaurora•org>
Dengcheng Zhu <dzhu@wavecomp•com> <dczhu@mips•com>
Dengcheng Zhu <dzhu@wavecomp•com> <dengcheng.zhu@gmail•com>
Dengcheng Zhu <dzhu@wavecomp•com> <dengcheng.zhu@imgtec•com>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-08-15 1:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-15 1:53 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-04-21 23:33 linux-next: manual merge of the hid tree with Linus' tree Stephen Rothwell
2015-02-24 0:00 Stephen Rothwell
2014-10-31 0:58 Stephen Rothwell
2014-03-17 2:32 Stephen Rothwell
2014-02-20 2:04 Stephen Rothwell
2014-02-20 2:03 Stephen Rothwell
2013-03-28 0:40 Stephen Rothwell
2012-09-10 1:33 Stephen Rothwell
2012-09-10 5:49 ` Marek Vasut
2012-06-27 1:05 Stephen Rothwell
2011-10-11 3:37 Stephen Rothwell
2011-10-11 10:52 ` Jiri Kosina
2010-11-09 1:33 Stephen Rothwell
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=20230815115325.0d20b960@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=benjamin.tissoires@redhat$(echo .)com \
--cc=david@readahead$(echo .)eu \
--cc=jikos@kernel$(echo .)org \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=quic_bjorande@quicinc$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox