On Tue, 2018-06-12 at 17:12 -0400, Paul Moore wrote: > On Tue, Jun 12, 2018 at 4:32 PM, James Morris <jmorris@xxxxxxxxx> wrote: > > On Mon, 11 Jun 2018, Casey Schaufler wrote: > > > > > If you want to break this up by security module I would take > > > the Smack part as soon as James does the tree update. If James > > > wants to take the whole thing at once you can add my: > > > > > > Acked-by: Casey Schaufler <casey@xxxxxxxxxxxxxxxx> > > > > > > for the Smack changes. > > > > It's probably simplest for me to take them as one patch. > > I would prefer if the SELinux changes were split into a separate > patch. I'm guessing John would probably want the same for the > AppArmor patches, but take his work for it, not mine. > > Joe, in general I really appreciate the fixes you send, but these > patches that cross a lot of subsystem boundaries (this isn't the first > one that does this) causes unnecessary conflicts in -next and during > the merge window. Could you split your patches up from now on please? Sorry. No. Merge conflicts are inherent in this system. There is just no good way to do this as sending a set of per subsystem patches guarantees partial application of the entire set. The nominal best way is for a script to be run and applied at the top level rather than sending a patch at all. If you prefer, each sub-subsystem maintainer, at whatever granularity desired, could apply the patch to the appropriate subsystem by using "git am --include=<subsystem_path>". cheers, Joe
