[lustre-devel] [PATCH 00/45] lustre: merged OpenSFS client patches from April 30 to today
NeilBrown
neilb at suse.de
Tue Jun 23 17:52:55 PDT 2020
On Tue, Jun 23 2020, Degremont, Aurelien wrote:
> Le 23/06/2020 06:11, « lustre-devel au nom de NeilBrown » <lustre-devel-bounces at lists.lustre.org au nom de neilb at suse.de> a écrit :
>
> On Mon, Jun 01 2020, James Simmons wrote:
>
> >> > Merge the client side patches that landed to the OpenSFS
> >> > tree since Apirl 30 to today. Include a fid missing patches
> >> > as well and one patch to fix issues with 2 patches from the
> >> > earlier 600+ patch set. Please review to ensure their correctness.
> >>
> >> Hi James,
> >> I tried applying these and hit lots of conflicts.
> >> What tree are they on top of?
> >
> > This is based off the top of my tree. Currently I'm using my tree as the
> > OpenSFS version of the Linux client so I only add things that land. Your
> > tree is more the development / prototype tree since it has not yet landed
> > things. So most likely its the LNet LU-13004 work that is conflicting.
> > I also run the patches by checkpatch which has the LNET comment change
> > that wasn't in the OpenSFS branch until just recently; OpenSFS commit
> > d3f1ceeb123da9603cd5ee3acbd4ee638a995f10. That should reduce the conflicts
> > going forward. We are getting to the point in which both our trees are
> > almost in sync ;-)
>
> I don't think it makes any sense to maintain two separate trees like
> this.
>
> Would you like to just keep maintaining your tree, and I'll stop with
> mine?
>
> If so, is your git tree published somewhere?
>
>
> By the way, where's your tree available Neil? I'm checking your github account but not sure this is there.
>
In the "linux" repo I have quite a few branches.
"lustre/lustre" is the latest lustre code (as of late april).
https://github.com/neilbrown/linux/tree/lustre/lustre
NeilBrown
>
> Aurélien
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <http://lists.lustre.org/pipermail/lustre-devel-lustre.org/attachments/20200624/49158995/attachment.sig>
More information about the lustre-devel
mailing list