From: David Sterba <dsterba@suse•cz>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: David Sterba <dsterba@suse•cz>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linus Torvalds <torvalds@linux-foundation•org>
Subject: Re: linux-next: manual merge of the btrfs tree with Linus' tree
Date: Thu, 15 Oct 2020 16:42:13 +0200 [thread overview]
Message-ID: <20201015144213.GP6756@twin.jikos.cz> (raw)
In-Reply-To: <20201015113530.115e0361@canb.auug.org.au>
On Thu, Oct 15, 2020 at 11:35:30AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Please do *not* rebase/rewrite your linux-next included tree and then
> immediately send it to Linus. Or if you do, the please also update
> what you have in linux-next (so you can sneak it past me :-().
> (mutter, mutter, unnecessary conflicts :-().
>
> I have dropped the brtfs tree from linux-next today.
I've pushed updated for-next and next-fixes to k.org, sorry for
inconvenience.
next prev parent reply other threads:[~2020-10-15 14:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 0:35 linux-next: manual merge of the btrfs tree with Linus' tree Stephen Rothwell
2020-10-15 14:42 ` David Sterba [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
2021-10-31 23:53 Stephen Rothwell
2021-11-02 10:42 ` David Sterba
2021-11-02 11:44 ` Stephen Rothwell
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=20201015144213.GP6756@twin.jikos.cz \
--to=dsterba@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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