Re: linux-next: manual merge of the bpf-next tree with the jc_docs tree

Stephen Rothwell
2019-04-15T01:09:02Z

[-- Attachment #1: Type: text/plain, Size: 1726 bytes --]

Hi all,

On Fri, 12 Apr 2019 11:05:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> .mailmap
>
> between commit:
>
> 9b628c6ab437 ("mailmap: update my obsolete email address")
>
> from the jc_docs tree and commit:
>
> fa0dcb3fe2ca ("mailmap: add entry for email addresses")
>
> from the bpf-next 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.
>
> diff --cc .mailmap
> index 151501c73503,e7984bb6b4b0..000000000000
> --- a/.mailmap
> +++ b/.mailmap
> @@@ -16,8 -16,9 +16,11 @@@ Alan Cox <alan@lxorguk.ukuu.org.uk
> Alan Cox <root@hraefn.swansea.linux.org.uk>
> Aleksey Gorelov <aleksey_gorelov@phoenix.com>
> Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
> +Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com>
> +Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org>
> + Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
> + Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
> + Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
> Al Viro <viro@ftp.linux.org.uk>
> Al Viro <viro@zenIV.linux.org.uk>
> Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>

This is now a conflict between the net-next tree and the jc_docs tree.