From: Logan Gunthorpe <logang@deltatee•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>, Greg KH <greg@kroah•com>,
Arnd Bergmann <arnd@arndb•de>,
Jarkko Sakkinen <jarkko.sakkinen@linux•intel.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
James Bottomley <James.Bottomley@HansenPartnership•com>,
Jason Gunthorpe <jgunthorpe@obsidianresearch•com>
Subject: Re: linux-next: manual merge of the char-misc tree with the tpmdd tree
Date: Tue, 21 Mar 2017 20:43:28 -0600 [thread overview]
Message-ID: <081d6fe2-b7bd-0b80-be71-09df0be5cd96@deltatee.com> (raw)
In-Reply-To: <20170322131319.6278c15d@canb.auug.org.au>
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
next prev parent reply other threads:[~2017-03-22 2:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-22 2:13 linux-next: manual merge of the char-misc tree with the tpmdd tree Stephen Rothwell
2017-03-22 2:43 ` Logan Gunthorpe [this message]
2017-03-23 21:36 ` Jarkko Sakkinen
-- strict thread matches above, loose matches on Subject: below --
2017-03-24 3:33 Stephen Rothwell
2017-03-24 6:55 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=081d6fe2-b7bd-0b80-be71-09df0be5cd96@deltatee.com \
--to=logang@deltatee$(echo .)com \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=jarkko.sakkinen@linux$(echo .)intel.com \
--cc=jgunthorpe@obsidianresearch$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox