On 11/6/2019 2:40 AM, James Morris wrote: > On Tue, 29 Oct 2019, Casey Schaufler wrote: > >>> Can you re-base on something more recent than v5.1-rc2 (that's the base for that branch currently)? >>> At present it won't even boot for me on modern Fedora. Two key missing commits are: >> Sigh. It's based on James' next-general. As it's going up through James, >> and he hasn't updated that branch, I'm sort of stuck. BTW, I have a re-based >> version, but don't see how to get it into my git tree without mucking up >> the eventual merge. > Don't use next-general for this. Use the most recent released kernel if > that works. On 9/24/2019 10:56 AM, James Morris wrote: > I'd probably create a new branch (next-stacking) from v5.4 for this work. I'm planning to switch over once next-stacking gets created. I've stuck with next-general because my understanding has been to not rebase unless necessary, and to not get ahead of what where you're expected to land. I'll rebase now, but fear I may end up with git tree issues moving from security#next-general. I am counting on getting next-stacking shortly after 5.4. Let me know if that plan changes.