Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Sat, 23 Jun 2018 14:38:14 +0200 (CEST)
From:   Thomas Gleixner <tglx@linutronix.de>
To:     Reinette Chatre <reinette.chatre@intel.com>
cc:     fenghua.yu@intel.com, Tony Luck <tony.luck@intel.com>,
        vikas.shivappa@linux.intel.com, gavin.hindman@intel.com,
        jithu.joseph@intel.com, dave.hansen@intel.com, mingo@redhat.com,
        "H. Peter Anvin" <hpa@zytor.com>, x86@kernel.org,
        LKML <linux-kernel@vger.kernel.org>,
        David Howells <dhowells@redhat.com>,
        Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: [PATCH V7 00/41] Intel(R) Resource Director Technology Cache
 Pseudo-Locking enabling
In-Reply-To: <alpine.DEB.2.21.1806231402500.8650@nanos.tec.linutronix.de>
Message-ID: <alpine.DEB.2.21.1806231434270.8650@nanos.tec.linutronix.de>
References: <cover.1529706536.git.reinette.chatre@intel.com> <alpine.DEB.2.21.1806231402500.8650@nanos.tec.linutronix.de>
User-Agent: Alpine 2.21 (DEB 202 2017-01-01)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Sat, 23 Jun 2018, Thomas Gleixner wrote:

> Reinette!
> 
> On Fri, 22 Jun 2018, Reinette Chatre wrote:
> > The Cache Pseudo-Locking enabling series that was recently merged to the
> > x86/cache branch of tip was found to conflict with the new kernfs support
> > for mounting with fs_context.
> > 
> > In preparation for a conflict-free merge between the two repos some no-op
> > hooks are created within the RDT mount function being changed by
> > the two features. The goal is for this commit to be placed on a minimal
> > no-rebase branch to be consumed by both features.
> 
> Thanks for doing this so quick! I've picked up the lot and slightly
> modified the first patch by moving the stubs to the header file to get them
> completely out of the conflicting area.
> 
> The immutable branch for David to pull is:
> 
>     git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git for-vfs
> 
> I've also created a branch based on Davids mount-context branch, applied
> the cleanup patch below to it and merged the for-vfs branch on top.
> 
> David feel free to pull the result from
> 
>     git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git for-vfs-merged
> 
> or pick up the patch below and do the merge and conflict resolution yourself.

I've force updated it after pushing out the variant which did not compile
instead of folding the fix back first. New head is:

   tip/for-vfs-merged 63b411121807: Merge branch 'for-vfs' into for-vfs-merged

/me hates computers and goes to mow the lawn