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  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date:   Mon, 15 Apr 2019 11:09:02 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Networking <netdev@...r.kernel.org>,
        Jonathan Corbet <corbet@....net>,
        David Miller <davem@...emloft.net>
Cc:     Daniel Borkmann <daniel@...earbox.net>,
        Alexei Starovoitov <ast@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Alex Shi <alex.shi@...ux.alibaba.com>
Subject: Re: linux-next: manual merge of the bpf-next tree with the jc_docs
 tree

Hi all,

On Fri, 12 Apr 2019 11:05:18 +1000 Stephen Rothwell <sfr@...b.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@...rguk.ukuu.org.uk
>   Alan Cox <root@...efn.swansea.linux.org.uk>
>   Aleksey Gorelov <aleksey_gorelov@...enix.com>
>   Aleksandar Markovic <aleksandar.markovic@...s.com> <aleksandar.markovic@...tec.com>
>  +Alex Shi <alex.shi@...ux.alibaba.com> <alex.shi@...el.com>
>  +Alex Shi <alex.shi@...ux.alibaba.com> <alex.shi@...aro.org>
> + Alexei Starovoitov <ast@...nel.org> <ast@...mgrid.com>
> + Alexei Starovoitov <ast@...nel.org> <alexei.starovoitov@...il.com>
> + Alexei Starovoitov <ast@...nel.org> <ast@...com>
>   Al Viro <viro@....linux.org.uk>
>   Al Viro <viro@...IV.linux.org.uk>
>   Andi Shyti <andi@...zian.org> <andi.shyti@...sung.com>

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

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists