linux-kernel - Re: linux-next: manual merge of the char-misc tree with the tpmdd 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: <081d6fe2-b7bd-0b80-be71-09df0be5cd96@deltatee.com>
Date:   Tue, 21 Mar 2017 20:43:28 -0600
From:   Logan Gunthorpe <logang@...tatee.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>, Greg KH <greg@...ah.com>,
        Arnd Bergmann <arnd@...db.de>,
        Jarkko Sakkinen <jarkko.sakkinen@...ux.intel.com>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        James Bottomley <James.Bottomley@...senPartnership.com>,
        Jason Gunthorpe <jgunthorpe@...idianresearch.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the tpmdd
 tree

Thanks Stephen,

I've reviewed the merge and it looks correct to me.

On 21/03/17 08:13 PM, Stephen Rothwell wrote:
> I fixed it up (I hope, 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.

Jarko and Jason both reviewed and were aware of my patch. No one
mentioned James' work or the potential for conflict.

Logan