From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Sterba <dsterba@suse.cz>
Cc: David Sterba <dsterba@suse.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Qu Wenruo <wqu@suse.com>
Subject: Re: linux-next: manual merge of the btrfs tree with Linus' tree
Date: Tue, 2 Nov 2021 22:44:11 +1100 [thread overview]
Message-ID: <20211102224411.53de0883@canb.auug.org.au> (raw)
In-Reply-To: <20211102104244.GH20319@suse.cz>
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
Hi David,
On Tue, 2 Nov 2021 11:42:44 +0100 David Sterba <dsterba@suse.cz> wrote:
>
> Thanks, it's a bit different that I did as a proposed conflict
> resulution and Linus resolved it in a yet another way. I'll refresh my
> for-next branch today to minimize the conflict surface.
Thanks. I really could only try to pattern match my resolution.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-11-02 11:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-31 23:53 linux-next: manual merge of the btrfs tree with Linus' tree Stephen Rothwell
2021-11-02 10:42 ` David Sterba
2021-11-02 11:44 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-10 23:03 Stephen Rothwell
2024-01-08 22:54 Stephen Rothwell
2023-10-31 0:18 Stephen Rothwell
2020-10-15 0:35 Stephen Rothwell
2020-10-15 14:42 ` David Sterba
2014-02-03 0:13 Stephen Rothwell
2014-01-29 0:54 Stephen Rothwell
2014-01-29 13:07 ` Michal Nazarewicz
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=20211102224411.53de0883@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dsterba@suse.com \
--cc=dsterba@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=wqu@suse.com \
/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).