From: Paul Moore <paul@paul-moore.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jeff Vander Stoep <jeffv@google.com>,
linux-audit@redhat.com
Subject: Re: linux-next: manual merge of the audit tree with Linus' tree
Date: Tue, 06 Oct 2015 13:21:14 -0400 [thread overview]
Message-ID: <1479357.JFI07qj0hM@sifl> (raw)
In-Reply-To: <20151006135501.2d8bbb5b@canb.auug.org.au>
On Tuesday, October 06, 2015 01:55:01 PM Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the audit tree got a conflict in:
>
> include/linux/lsm_audit.h
>
> between commit:
>
> 671a2781ff01 ("security: add ioctl specific auditing to lsm_audit")
>
> from Linus' tree and commit:
>
> 43cfd5e38587 ("audit: constify parts of common_audit_data and
> lsm_network_audit")
>
> from the audit tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks, that patch looks correct, although I'm going to drop the patch causing
this problem for the time being as there are some oddities with the build
warning that you posted which aren't immediately obvious to me. Something
weird is causing it to work in audit#next but throw a warning when applied on
top of Linus' current ... I'll reapply the patch once I've resolved the issue.
--
paul moore
www.paul-moore.com
next parent reply other threads:[~2015-10-06 17:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20151006135501.2d8bbb5b@canb.auug.org.au>
2015-10-06 17:21 ` Paul Moore [this message]
[not found] <20170119135130.739d4f7b@canb.auug.org.au>
2017-01-19 4:16 ` linux-next: manual merge of the audit tree with Linus' tree Richard Guy Briggs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1479357.JFI07qj0hM@sifl \
--to=paul@paul-moore.com \
--cc=jeffv@google.com \
--cc=linux-audit@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox