| Subject | Re: [PATCH V7 00/41] Intel(R) Resource Director Technology Cache Pseudo-Locking enabling | From | Reinette Chatre <> | Date | Sun, 24 Jun 2018 02:20:25 -0700 |
| |
Hi Thomas,
On 6/23/2018 5:16 AM, Thomas Gleixner wrote: > 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. > > The x86/cache branch is rebased and merges cleanly with for-vfs-merged. The > last two patches are dropped; I folded them back to the patches they fix. > > git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/cache
Thank you very much for setting up all the branches to support a smooth merge.
> > Reinette, can you please verify that x86/cache + for-vfs-merged are doing > the right thing?
Will do. While tracking down the bisect issue related to copy_from_user() I managed to lose connectivity to my test system. I will continue the testing when I am back in the office on Monday.
Reinette
|