From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Borislav Petkov <bp@alien8.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the edac-amd tree with Linus' tree
Date: Fri, 26 Jun 2015 18:22:56 +1000 [thread overview]
Message-ID: <20150626182256.03241d32@canb.auug.org.au> (raw)
In-Reply-To: <20150626072723.GB14572@pd.tnic>
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
Hi Borislav,
On Fri, 26 Jun 2015 09:27:23 +0200 Borislav Petkov <bp@alien8.de> wrote:
>
> yes, that's the right thing to do. If there's anything I should do to
> let you know when to start merging it again, please let me know.
I just fetch it every morning, so if you just want to set your for-next
branch to somewhere in Linus' tree (so it is effectively empty), then
that would be easiest for me.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-06-26 8:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-26 7:08 linux-next: manual merge of the edac-amd tree with Linus' tree Stephen Rothwell
2015-06-26 7:27 ` Borislav Petkov
2015-06-26 8:22 ` Stephen Rothwell [this message]
2015-06-26 8:34 ` Borislav Petkov
2015-06-26 8:37 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-08-05 5:09 Stephen Rothwell
2009-08-05 6:22 ` Borislav Petkov
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=20150626182256.03241d32@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bp@alien8.de \
--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;
as well as URLs for NNTP newsgroup(s).