From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat•com>
Cc: Joerg Roedel <joro@8bytes•org>,
Jean-Philippe Brucker <Jean-Philippe.Brucker@arm•com>,
Nathan Chancellor <natechancellor@gmail•com>,
Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Suzuki Poulose <Suzuki.Poulose@arm•com>,
Mathieu Poirier <mathieu.poirier@linaro•org>
Subject: Re: linux-next: manual merge of the char-misc tree with the driver-core tree
Date: Wed, 3 Jul 2019 07:41:09 +1000 [thread overview]
Message-ID: <20190703074109.4b2ca5bc@canb.auug.org.au> (raw)
In-Reply-To: <20190702130511-mutt-send-email-mst@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]
Hi all,
On Tue, 2 Jul 2019 13:05:59 -0400 "Michael S. Tsirkin" <mst@redhat•com> wrote:
>
> On Tue, Jul 02, 2019 at 05:58:51PM +0200, Joerg Roedel wrote:
> > On Tue, Jul 02, 2019 at 11:23:34AM -0400, Michael S. Tsirkin wrote:
> > > I can drop virtio iommu from my tree. Where's yours? I'd like to take a
> > > last look and send an ack.
> >
> > It is not in my tree yet, because I was waiting for your ack on the
> > patches wrt. the spec.
> >
> > Given that the merge window is pretty close I can't promise to take it
> > into my tree for v5.3 when you ack it, so if it should go upstream this
> > time its better to keep it in your tree.
>
> Hmm. But then the merge build fails. I guess I will have to include the
> patch in the pull request then?
>
All you (and the driver-core maintainer) need to do is make sure you
tell Linus that the merge requires the fix ... he can then apply it to
the merge commit just as I have. Linus has asked that maintainers do
not (in general) cross merge to avoid these (semantic) conflicts.
Sometimes, in more complex cases, it may be necessary for maintainers
to share a (non changing) subset of their trees, but this case is
pretty trivial.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-07-03 1:17 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-01 9:09 linux-next: manual merge of the char-misc tree with the driver-core tree Stephen Rothwell
2019-07-01 18:39 ` Nathan Chancellor
2019-07-01 21:53 ` Stephen Rothwell
2019-07-01 20:04 ` Nathan Chancellor
2019-07-01 21:58 ` Stephen Rothwell
2019-07-02 14:18 ` Jean-Philippe Brucker
2019-07-02 15:18 ` Joerg Roedel
2019-07-02 15:23 ` Michael S. Tsirkin
2019-07-02 15:58 ` Joerg Roedel
2019-07-02 17:05 ` Michael S. Tsirkin
2019-07-02 21:41 ` Stephen Rothwell [this message]
2019-07-03 8:41 ` Suzuki K Poulose
2019-07-12 0:53 ` Stephen Rothwell
2019-07-15 20:22 ` Mathieu Poirier
-- strict thread matches above, loose matches on Subject: below --
2025-09-08 6:25 Stephen Rothwell
2025-09-08 8:57 ` Greg KH
2019-06-20 5:35 Stephen Rothwell
2019-06-20 6:20 ` Greg KH
2019-07-08 23:51 ` Stephen Rothwell
2019-07-09 7:12 ` Winkler, Tomas
2019-07-10 6:00 ` Stephen Rothwell
2019-06-13 5:53 Stephen Rothwell
2019-06-13 6:10 ` Greg KH
2019-07-08 23:20 ` Stephen Rothwell
2019-07-08 23:25 ` Nadav Amit
2019-07-09 6:15 ` Greg KH
2019-07-12 7:45 ` Greg KH
2017-02-01 4:28 Stephen Rothwell
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=20190703074109.4b2ca5bc@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jean-Philippe.Brucker@arm$(echo .)com \
--cc=Suzuki.Poulose@arm$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=joro@8bytes$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mathieu.poirier@linaro$(echo .)org \
--cc=mst@redhat$(echo .)com \
--cc=natechancellor@gmail$(echo .)com \
/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