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

Message-ID: <20190712162307.4d63a16a@canb.auug.org.au>
Date:   Fri, 12 Jul 2019 16:23:07 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Yoshinori Sato <ysato@...rs.sourceforge.jp>
Cc:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Krzysztof Kozlowski <krzk@...nel.org>,
        Jiri Pirko <jiri@...lanox.com>
Subject: Re: linux-next: manual merge of the net-next tree with the sh tree

Hi Yoshinori,

On Fri, 12 Jul 2019 14:49:00 +0900 Yoshinori Sato <ysato@...rs.sourceforge.jp> wrote:
>
> I can not update sh-next now, so I will fix it tomorrow.

You don't need to (and should not) update your tree, just mention the
conflicts to Linus when you send your pull request.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped