linux-security-module.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PULL] Smack: Changes for 4.15
@ 2017-11-01 23:56 Casey Schaufler
  2017-11-02  0:18 ` James Morris
  0 siblings, 1 reply; 3+ messages in thread
From: Casey Schaufler @ 2017-11-01 23:56 UTC (permalink / raw)
  To: linux-security-module

Only one change for Smack for 4.15. A fix for overlayfs handling.

The following changes since commit eb95b40b45a1ee4218cab0e6c72dd014d8f09bee:

  Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security into next (2017-09-25 11:03:43 -0700)

are available in the git repository at:

  git://github.com/cschaufler/smack-next smack-for-4.15

for you to fetch changes up to c31a5d0182e7b76392295b9a9a5637ca1022c450:

  Smack: Base support for overlayfs (2017-10-16 12:13:12 -0700)

----------------------------------------------------------------
Casey Schaufler (1):
      Smack: Base support for overlayfs

 security/smack/smack_lsm.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PULL] Smack: Changes for 4.15
  2017-11-01 23:56 [PULL] Smack: Changes for 4.15 Casey Schaufler
@ 2017-11-02  0:18 ` James Morris
  2017-11-02  0:35   ` Casey Schaufler
  0 siblings, 1 reply; 3+ messages in thread
From: James Morris @ 2017-11-02  0:18 UTC (permalink / raw)
  To: linux-security-module

On Wed, 1 Nov 2017, Casey Schaufler wrote:

> Only one change for Smack for 4.15. A fix for overlayfs handling.
> 
> The following changes since commit eb95b40b45a1ee4218cab0e6c72dd014d8f09bee:
> 
>   Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security into next (2017-09-25 11:03:43 -0700)
> 
> are available in the git repository at:
> 
>   git://github.com/cschaufler/smack-next smack-for-4.15
> 
> for you to fetch changes up to c31a5d0182e7b76392295b9a9a5637ca1022c450:
> 
>   Smack: Base support for overlayfs (2017-10-16 12:13:12 -0700)
> 
> ----------------------------------------------------------------
> Casey Schaufler (1):
>       Smack: Base support for overlayfs
> 
>  security/smack/smack_lsm.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 79 insertions(+)

I'll cherry pick this but it looks like you're pulling stuff into your 
tree from Linus (including the IMA & Tomoyo changes which Paul 
acccidentally sent).

Please base your tree off next-general, not Linus.


- James
-- 
James Morris
<james.l.morris@oracle.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PULL] Smack: Changes for 4.15
  2017-11-02  0:18 ` James Morris
@ 2017-11-02  0:35   ` Casey Schaufler
  0 siblings, 0 replies; 3+ messages in thread
From: Casey Schaufler @ 2017-11-02  0:35 UTC (permalink / raw)
  To: linux-security-module

Hmm. I pulled from your next-general branch.
I had already pulled from your "next" branch when all the bruhaha
hit, so that may be what you see in the tree. This may be an artifact
of the "process" change.


On 11/1/2017 5:18 PM, James Morris wrote:
> On Wed, 1 Nov 2017, Casey Schaufler wrote:
>
>> Only one change for Smack for 4.15. A fix for overlayfs handling.
>>
>> The following changes since commit eb95b40b45a1ee4218cab0e6c72dd014d8f09bee:
>>
>>   Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security into next (2017-09-25 11:03:43 -0700)
>>
>> are available in the git repository at:
>>
>>   git://github.com/cschaufler/smack-next smack-for-4.15
>>
>> for you to fetch changes up to c31a5d0182e7b76392295b9a9a5637ca1022c450:
>>
>>   Smack: Base support for overlayfs (2017-10-16 12:13:12 -0700)
>>
>> ----------------------------------------------------------------
>> Casey Schaufler (1):
>>       Smack: Base support for overlayfs
>>
>>  security/smack/smack_lsm.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 79 insertions(+)
> I'll cherry pick this but it looks like you're pulling stuff into your 
> tree from Linus (including the IMA & Tomoyo changes which Paul 
> acccidentally sent).
>
> Please base your tree off next-general, not Linus.
>
>
> - James

--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-11-02  0:35 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-01 23:56 [PULL] Smack: Changes for 4.15 Casey Schaufler
2017-11-02  0:18 ` James Morris
2017-11-02  0:35   ` Casey Schaufler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).