From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Russell King - ARM Linux admin <linux@armlinux.org.uk>
Cc: Ard Biesheuvel <ardb@kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>
Subject: Re: linux-next: manual merge of the arm tree with Linus' tree
Date: Sat, 30 May 2020 19:53:11 +1000 [thread overview]
Message-ID: <20200530195311.0ae2d1d8@canb.auug.org.au> (raw)
In-Reply-To: <20200530091747.GD1551@shell.armlinux.org.uk>
[-- Attachment #1: Type: text/plain, Size: 488 bytes --]
Hi Russell,
On Sat, 30 May 2020 10:17:47 +0100 Russell King - ARM Linux admin <linux@armlinux.org.uk> wrote:
>
> I don't know - I don't have a resolution for the first one, Stephen
> didn't provide a 3-way diff with his report, and I was expecting a
> 3-way diff from you for it rather than another pull request.
There is no 3-way diff, because "I just used the latter" i.e. I used
the arm tree version of the conflicted section of the file.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-05-30 9:53 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 23:09 linux-next: manual merge of the arm tree with Linus' tree Stephen Rothwell
2020-05-27 23:22 ` Russell King - ARM Linux admin
2020-05-28 7:01 ` Ard Biesheuvel
2020-05-30 8:41 ` Russell King - ARM Linux admin
2020-05-30 8:51 ` Ard Biesheuvel
2020-05-30 9:17 ` Russell King - ARM Linux admin
2020-05-30 9:53 ` Stephen Rothwell [this message]
2020-05-30 10:25 ` Ard Biesheuvel
-- strict thread matches above, loose matches on Subject: below --
2022-03-08 22:35 Stephen Rothwell
2016-06-01 0:07 Stephen Rothwell
2016-06-01 8:52 ` Russell King
2012-03-30 0:11 Stephen Rothwell
2012-03-26 0:05 Stephen Rothwell
2012-03-13 0:08 Stephen Rothwell
2012-03-13 6:16 ` Ingo Molnar
2012-03-13 8:33 ` Russell King
2012-03-13 8:36 ` Ingo Molnar
2012-03-13 8:47 ` Russell King
2012-03-13 8:56 ` Ingo Molnar
2012-03-13 9:00 ` Russell King
2012-03-13 8:48 ` Ingo Molnar
2012-03-13 8:58 ` Russell King
2012-03-13 9:06 ` Ingo Molnar
2012-03-13 9:09 ` Russell King
2012-03-13 9:11 ` Russell King
2012-01-29 23:38 Stephen Rothwell
2012-01-08 23:53 Stephen Rothwell
2012-01-08 23:53 linux-next: manual merge of the arm tree with Linus tree Stephen Rothwell
2012-01-08 23:53 linux-next: manual merge of the arm tree with Linus' tree Stephen Rothwell
2011-12-20 23:08 Stephen Rothwell
2011-09-21 0:33 Stephen Rothwell
2011-09-21 9:31 ` Linus Walleij
2010-07-13 0:51 Stephen Rothwell
2010-03-03 23:49 Stephen Rothwell
2010-03-04 1:16 ` Eric Miao
2010-03-03 23:33 Stephen Rothwell
2009-07-31 0:33 Stephen Rothwell
2009-07-31 0:41 ` H Hartley Sweeten
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=20200530195311.0ae2d1d8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ardb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mingo@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;
as well as URLs for NNTP newsgroup(s).