On Thu, Sep 26, 2019 at 12:42:24PM -0500, Dr. G.W. Wettstein wrote: > On Sep 19, 1:00pm, Sean Christopherson wrote: > } Subject: Re: SGX release branch. Shouldn't this be an opening brace? :-) > > Good day to everyone. > > > On Thu, Sep 19, 2019 at 09:50:30AM -0500, Dr. G.W. Wettstein wrote: > > > It would be perhaps helpful for everyone if we could have a quick > > > summary of what the remote branches in jarkko-sgx are are targeting. > > > > I recommend ignoring everything except jarkko/master. master isn't > > necessarily the bleeding edge, but it's the canonical reference with > > respect to changes that have passed internal review, and for the most part > > it is stable (there have been a few hiccups). > > > All other branches in Jarkko's repository are either unrelated to > > the initial upstreaming and/or are for Jarkko's own development. > > Thank you for the clarifications. > > Is it just us or is there something up with the history on these > branches? Not just you, the branches, including master, are deliberately rebased and rewritten. > We have a local tracking branch that was created on a previous > instance of jarkko-sgx/master that doesn't bear any resemblance to the > current state of jarkko-sgx/master. The version that we had branched > against had the driver broken into a core and driver component, the > driver was in a sub-directory of the core SGX code and could be built > as a module. > > We created a new tracking branch against the current jarkko-sgx/master > and the driver architecture is completely different. Most notably the > driver cannot be built as a module and there is no driver > sub-directory. > > We have also also universally had pull's end up with merge conflicts, > even when there have been no changes to the local branch. > > I'm assuming now, given the comments above, that moving forward > jarkko-sgx/master will be a continuous development history? master will become stable when SGX is merged into the mainline kernel. Until then, the reality is that we need rebase on the latest upstream, squash commits, and rewrite history to prep the series for submission. I agree that a complete history would be convenient, but keeping such a branch perferctly aligned with master would incur a non-trivial amount of overhead, and anything but 100% accuracy would do more harm than good. > Have a good remainder of the week. > > Dr. Greg > > }-- End of excerpt from Sean Christopherson > > As always, > Dr. Greg Wettstein, Ph.D, Worker > IDfusion, LLC SGX secured infrastructure and > 4206 N. 19th Ave. autonomously self-defensive platforms. > Fargo, ND 58102 > PH: 701-281-1686 EMAIL: greg@xxxxxxxxxxxx > ------------------------------------------------------------------------------ > "Courage is not the absence of fear, but rather the judgement that > something else is more important than fear." > -- Ambrose Redmoon
