From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751995AbdILWAf (ORCPT ); Tue, 12 Sep 2017 18:00:35 -0400 Received: from mail-lf0-f45.google.com ([209.85.215.45]:36868 "EHLO mail-lf0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751542AbdILWAb (ORCPT ); Tue, 12 Sep 2017 18:00:31 -0400 X-Google-Smtp-Source: AOwi7QCCYT22ipdeRRdyrz63ESMXi3Md9+wUrIh61TPxiBURGhyERRAdCgBHeyFqNTwvwMZNWzzxq6ZWRTCPxlRJtEg= MIME-Version: 1.0 X-Originating-IP: [12.145.98.253] In-Reply-To: References: From: Paul Moore Date: Tue, 12 Sep 2017 18:00:29 -0400 Message-ID: Subject: Re: [GIT PULL] SELinux patches for v4.14 To: Linus Torvalds Cc: James Morris , selinux@tycho.nsa.gov, LSM List , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Sep 12, 2017 at 4:24 PM, Linus Torvalds wrote: > On Tue, Sep 12, 2017 at 10:33 AM, Paul Moore wrote: >> As discussed on the linux-security pull request thread, this is the >> direct SELinux pull request; the content/tag is the same as what I >> sent to James/linux-security earlier: > > The contents may be the same, but the base is different. > > In particular, you based it on the security tree that already had a > few other patches, so now that branch contains not just selinux work, > but also a couple of tomoyo patches that came in that way. > > Anyway, I pulled this simply because it was easier to review and > didn't have anything I disliked per se, but if we're going to actually > keep the different securlty layers separate, they need to also have > clean bases for the work in the future. > > Anyway, I'm at the airport on my way back home, and hopefully I'll be > back to normal tomorrow after a good night's sleep, and I can take a > look at the rest. Oof, sorry about the base mixup; I'll change the SELinux tree base moving forward so this shouldn't happen again. -- paul moore www.paul-moore.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: paul@paul-moore.com (Paul Moore) Date: Tue, 12 Sep 2017 18:00:29 -0400 Subject: [GIT PULL] SELinux patches for v4.14 In-Reply-To: References: Message-ID: To: linux-security-module@vger.kernel.org List-Id: linux-security-module.vger.kernel.org On Tue, Sep 12, 2017 at 4:24 PM, Linus Torvalds wrote: > On Tue, Sep 12, 2017 at 10:33 AM, Paul Moore wrote: >> As discussed on the linux-security pull request thread, this is the >> direct SELinux pull request; the content/tag is the same as what I >> sent to James/linux-security earlier: > > The contents may be the same, but the base is different. > > In particular, you based it on the security tree that already had a > few other patches, so now that branch contains not just selinux work, > but also a couple of tomoyo patches that came in that way. > > Anyway, I pulled this simply because it was easier to review and > didn't have anything I disliked per se, but if we're going to actually > keep the different securlty layers separate, they need to also have > clean bases for the work in the future. > > Anyway, I'm at the airport on my way back home, and hopefully I'll be > back to normal tomorrow after a good night's sleep, and I can take a > look at the rest. Oof, sorry about the base mixup; I'll change the SELinux tree base moving forward so this shouldn't happen again. -- paul moore www.paul-moore.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