linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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

  reply	other threads:[~2015-10-06 17:21 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-06  2:55 linux-next: manual merge of the audit tree with Linus' tree Stephen Rothwell
2015-10-06 17:21 ` Paul Moore [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-04-08  1:31 Stephen Rothwell
2019-04-08 17:15 ` Dmitry V. Levin
2019-04-08 20:30   ` Paul Moore
2017-03-24  2:18 Stephen Rothwell
2017-03-24  6:33 ` Richard Guy Briggs
2017-03-24 16:39 ` Paul Moore
2017-01-19  2:51 Stephen Rothwell
2017-01-19  4:16 ` Richard Guy Briggs
2016-11-22  5:29 Stephen Rothwell
2016-11-22 10:35 ` Richard Guy Briggs
2016-11-22 21:25   ` Paul Moore
2016-01-19  1:02 Stephen Rothwell
2016-01-19  2:48 ` Paul Moore
2015-11-19  1:06 Stephen Rothwell
2015-11-19 15:53 ` Paul Moore
2015-11-19 18:30   ` Richard Guy Briggs
2015-11-19 20:16     ` Stephen Rothwell
2015-08-07  4:15 Stephen Rothwell
2015-08-07  6:33 ` Richard Guy Briggs
2015-06-01  6:30 Stephen Rothwell
2015-06-01 15:59 ` Richard Guy Briggs
2015-01-20  4:04 Stephen Rothwell
2015-01-20  4:04 Stephen Rothwell
2015-01-20 15:45 ` Paul Moore
2015-01-20  4:03 Stephen Rothwell
2014-04-22  3:58 Stephen Rothwell
2014-04-16  4:02 Stephen Rothwell
2014-04-16 12:08 ` Eric Paris
2014-04-01  4:07 Stephen Rothwell
2014-04-01 12:54 ` Richard Guy Briggs
2014-04-01 13:11   ` Stephen Rothwell
2014-01-15  4:48 Stephen Rothwell
2013-11-06  6:19 Stephen Rothwell

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;
as well as URLs for NNTP newsgroup(s).