From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Darren Hart <dvhart@infradead.org>, Greg KH <greg@kroah.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Hans de Goede <hdegoede@redhat.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the drivers-x86 tree
Date: Wed, 1 Apr 2020 18:18:10 +1100 [thread overview]
Message-ID: <20200401181810.14792d60@canb.auug.org.au> (raw)
In-Reply-To: <CAHp75VdoMpA4tDg57UND5hnWXV60EGaThPxLnTpKT6wG7bdYYQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 533 bytes --]
Hi Andy,
On Wed, 1 Apr 2020 09:47:20 +0300 Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
>
> On Wed, Apr 1, 2020 at 6:11 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > This is now a conflict between the drivers-x86 tree and Linus' tree.
>
> PDx86 is in Linus tree already with conflict resolutions.
Great.
There is always a bit of a lag with what I see during the merge
window i.e. Linus continues to merge stuff after I have taken my daily
snapshot of his tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-04-01 7:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 3:38 linux-next: manual merge of the driver-core tree with the drivers-x86 tree Stephen Rothwell
2020-03-23 9:57 ` Greg KH
2020-03-23 11:43 ` Andy Shevchenko
2020-04-01 3:11 ` Stephen Rothwell
2020-04-01 6:47 ` Andy Shevchenko
2020-04-01 7:18 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-07 8:40 Stephen Rothwell
2024-11-07 8:51 ` Greg KH
2024-11-07 10:26 ` 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=20200401181810.14792d60@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andy.shevchenko@gmail.com \
--cc=dvhart@infradead.org \
--cc=greg@kroah.com \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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