linux-kernel - Re: linux-next: manual merge of the vfs tree with the orangefs 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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190504082634.6f78a061@canb.auug.org.au>
Date:   Sat, 4 May 2019 08:26:34 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mike Marshall <hubcap@...ibond.com>
Cc:     Al Viro <viro@...iv.linux.org.uk>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Martin Brandenburg <martin@...ibond.com>
Subject: Re: linux-next: manual merge of the vfs tree with the orangefs tree

Hi Mike,

On Fri, 3 May 2019 13:34:49 -0400 Mike Marshall <hubcap@...ibond.com> wrote:
>
> I noticed the conflict too when I added Al's patch series to the orangefs
> tree we have on next. I understood Linus to say he'd fix the conflict the
> way you did during the merge window. I guess that means you'll have to
> keep fixing it on next until then... I hate causing trouble, let me know if
> there's something different I should do to help...

Its all good.  I use "git rerere" which remembers the conflicts I have
fixed once and fixes them automatically the next time I do the same
merge.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped