linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: David Howells <dhowells@redhat.com>,
	Reinette Chatre <reinette.chatre@intel.com>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the vfs tree
Date: Fri, 22 Jun 2018 15:39:16 +0200 (CEST)	[thread overview]
Message-ID: <alpine.DEB.2.21.1806221537570.2402@nanos.tec.linutronix.de> (raw)
In-Reply-To: <20180622130600.GY30522@ZenIV.linux.org.uk>

On Fri, 22 Jun 2018, Al Viro wrote:
> On Fri, Jun 22, 2018 at 01:45:23PM +0100, David Howells wrote:
> > Reinette Chatre <reinette.chatre@intel.com> wrote:
> > 
> > > Thomas and David, please let me know what I can do from my side to help
> > > with this.
> > 
> > You could try basing on Al Viro's for-next tree which has the mount API
> > changes in it.
> 
> Umm...  That would be a massive headache for everyone involved; the changes
> in there have very little in common with what you are doing in rdt_mount(),
> so it might make sense to start with a minimal never-rebased branch that
> would
> 	* define rdt_pseudo_lock_init as 0
> 	* define rdt_pseudo_lock_release as empty
> 	* do the rdt_mount() part of a3dbd01e6c9d
> 	* have commit message along the lines of
> "hooks in rdt_mount() for rdt_pseudo_lock to use
> 
> Functionally a no-op right now; the only reason for having that
> as a never-rebased branch to get rdt_pseudo_lock and mount series
> out of each other's hair"
> 
> Base that on -rc1, then pull it into your rdt branch and David could pull the
> same into his.

Yes, that works.

Reinette, can you please look into creating that ordering. Then we just zap
the existing branch and redo it with this scheme.

Thanks,

	tglx

  reply	other threads:[~2018-06-22 13:39 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-22  1:53 linux-next: manual merge of the tip tree with the vfs tree Stephen Rothwell
2018-06-22  1:56 ` Stephen Rothwell
2018-06-22  6:13 ` Reinette Chatre
2018-06-22  6:56   ` Thomas Gleixner
2018-06-22 12:45 ` David Howells
2018-06-22 13:06   ` Al Viro
2018-06-22 13:39     ` Thomas Gleixner [this message]
2018-06-22 15:09       ` Reinette Chatre
2018-06-22 15:44         ` Thomas Gleixner
  -- strict thread matches above, loose matches on Subject: below --
2021-01-06  0:15 Stephen Rothwell
2020-10-01  6:34 Stephen Rothwell
2020-09-25  5:30 Stephen Rothwell
2020-07-27  5:35 Stephen Rothwell
2020-08-05  1:03 ` Stephen Rothwell
2018-11-26  4:39 Stephen Rothwell
2019-01-02  1:56 ` Stephen Rothwell
2016-09-29  2:57 Stephen Rothwell
2012-07-05  5:00 Stephen Rothwell
2011-03-14  8:11 Stephen Rothwell

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=alpine.DEB.2.21.1806221537570.2402@nanos.tec.linutronix.de \
    --to=tglx@linutronix.de \
    --cc=dhowells@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=reinette.chatre@intel.com \
    --cc=sfr@canb.auug.org.au \
    --cc=viro@ZenIV.linux.org.uk \
    /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).