From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>,
Heiko Carstens <hca@linux.ibm.com>,
Mike Rapoport <rppt@kernel.org>,
linux-next@vger.kernel.org
Subject: Re: Upcoming merge conflict between akpm-current/current and s390 trees
Date: Wed, 27 Oct 2021 09:03:24 +1100 [thread overview]
Message-ID: <20211027090324.5391ab99@canb.auug.org.au> (raw)
In-Reply-To: <your-ad-here.call-01635257155-ext-6484@work.hours>
[-- Attachment #1: Type: text/plain, Size: 312 bytes --]
Hi Vasily,
On Tue, 26 Oct 2021 16:05:55 +0200 Vasily Gorbik <gor@linux.ibm.com> wrote:
>
> updating s390 tree for linux-next today I hit a merge conflict with
> akpm-current/current. Please find conflict resolution below.
Thanks for the heads up and merge resolution.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2021-10-26 22:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 14:05 Upcoming merge conflict between akpm-current/current and s390 trees Vasily Gorbik
2021-10-26 22:03 ` Stephen Rothwell [this message]
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=20211027090324.5391ab99@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=agordeev@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=linux-next@vger.kernel.org \
--cc=rppt@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).