Re: [GIT PULL] Security subsystem updates for 4.14

From	James Morris <jmorris@namei.org>
Newsgroups	linux.kernel
Subject	Re: [GIT PULL] Security subsystem updates for 4.14
Date	2017-09-10 06:40 +0200
Message-ID	<uo2ch-75m-3@gated-at.bofh.it> (permalink)
References	(1 earlier) <un9zc-3GP-15@gated-at.bofh.it> <unjoR-1Us-7@gated-at.bofh.it> <unlAm-3xn-17@gated-at.bofh.it> <unvgl-1Cc-15@gated-at.bofh.it> <unvq1-1Fs-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Fri, 8 Sep 2017, Paul Moore wrote:

> > This is also why I tend to prefer getting multiple branches for
> > independent things.

[...]

> 
> Is it time to start sending pull request for each LSM and thing under
> security/ directly?  I'm not sure I have a strong preference either
> way, I just don't want to see the SELinux changes ignored during the
> merge window.

They won't be ignored, we just need to get this issue resolved now and 
figure out how to implement multiple branches in the security tree.

Looking at other git repos, the x86 folk have multiple branches.

One option for me would be to publish the trees I pull from as branches 
along side mine, with 'next' being a merge of all of directly applied 
patchsets and those ready for Linus to pull as one.

So, branches in 
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

might be:

  next-selinux         (Paul's next branch)
  next-apparmor-next   (JJ's next branch)
  next-integrity-next  (Mimi's)
  next-tpm-next        (Jarkko's)
  [etc.]

  next                 (merge all of the above to here)

That way, we have a coherent 'next' branch for people to develop against 
and to push to Linus, but he can pull individual branches feeding into it 
if something is broken in one of them.

Does that sound useful?

-- 
James Morris
<jmorris@namei.org>

Thread

[GIT PULL] Security subsystem updates for 4.14 James Morris <jmorris@namei.org> - 2017-09-04 12:40 +0200
  Re: [GIT PULL] Security subsystem updates for 4.14 Linus Torvalds <torvalds@linux-foundation.org> - 2017-09-07 20:20 +0200
    Re: [GIT PULL] Security subsystem updates for 4.14 James Morris <jmorris@namei.org> - 2017-09-08 06:50 +0200
      Re: [GIT PULL] Security subsystem updates for 4.14 Christoph Hellwig <hch@infradead.org> - 2017-09-08 09:10 +0200
        Re: [GIT PULL] Security subsystem updates for 4.14 Linus Torvalds <torvalds@linux-foundation.org> - 2017-09-08 19:30 +0200
          Re: [GIT PULL] Security subsystem updates for 4.14 Paul Moore <paul@paul-moore.com> - 2017-09-08 19:40 +0200
            Re: [GIT PULL] Security subsystem updates for 4.14 James Morris <jmorris@namei.org> - 2017-09-10 06:40 +0200
              Re: [GIT PULL] Security subsystem updates for 4.14 James Morris <jmorris@namei.org> - 2017-09-10 07:00 +0200
              Re: [GIT PULL] Security subsystem updates for 4.14 Paul Moore <paul@paul-moore.com> - 2017-09-12 00:40 +0200
              Re: [GIT PULL] Security subsystem updates for 4.14 Kees Cook <keescook@chromium.org> - 2017-09-14 23:10 +0200
                Re: [GIT PULL] Security subsystem updates for 4.14 James Morris <jmorris@namei.org> - 2017-09-14 23:20 +0200
                Re: [GIT PULL] Security subsystem updates for 4.14 Kees Cook <keescook@chromium.org> - 2017-09-14 23:30 +0200
          Re: [GIT PULL] Security subsystem updates for 4.14 James Morris <jmorris@namei.org> - 2017-09-08 22:00 +0200
            Re: [GIT PULL] Security subsystem updates for 4.14 Mimi Zohar <zohar@linux.vnet.ibm.com> - 2017-09-17 09:40 +0200
          Re: [GIT PULL] Security subsystem updates for 4.14 Christoph Hellwig <hch@infradead.org> - 2017-09-10 10:20 +0200
            Re: [GIT PULL] Security subsystem updates for 4.14 Mimi Zohar <zohar@linux.vnet.ibm.com> - 2017-09-10 16:10 +0200
              Re: [GIT PULL] Security subsystem updates for 4.14 Christoph Hellwig <hch@infradead.org> - 2017-09-11 08:40 +0200
                Re: [GIT PULL] Security subsystem updates for 4.14 Mimi Zohar <zohar@linux.vnet.ibm.com> - 2017-09-11 23:40 +0200
      Re: [GIT PULL] Security subsystem updates for 4.14 Theodore Ts'o <tytso@mit.edu> - 2017-09-09 00:40 +0200
        Re: [GIT PULL] Security subsystem updates for 4.14 James Morris <jmorris@namei.org> - 2017-09-10 04:10 +0200
        Re: [GIT PULL] Security subsystem updates for 4.14 Mimi Zohar <zohar@linux.vnet.ibm.com> - 2017-09-10 09:20 +0200
          Re: [GIT PULL] Security subsystem updates for 4.14 Theodore Ts'o <tytso@mit.edu> - 2017-09-10 14:20 +0200
    Re: [GIT PULL] Security subsystem updates for 4.14 Mimi Zohar <zohar@linux.vnet.ibm.com> - 2017-09-10 08:50 +0200

csiph-web