From: Paul Moore <paul.moore@hp•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: James Morris <jmorris@namei•org>,
linux-next@vger•kernel.org,
Etienne Basset <etienne.basset@numericable•fr>
Subject: Re: linux-next: manual merge of the lblnet tree with the security-testing tree
Date: Fri, 27 Mar 2009 12:32:53 -0400 [thread overview]
Message-ID: <200903271232.53524.paul.moore@hp.com> (raw)
In-Reply-To: <20090327161957.2bb234d4.sfr@canb.auug.org.au>
On Friday 27 March 2009 01:19:57 am Stephen Rothwell wrote:
> Hi Paul, James,
>
> Today's linux-next merge of the lblnet tree got a conflict in
> security/smack/smack_lsm.c between commit
> 7198e2eeb44b3fe7cc97f997824002da47a9c644 ("smack: convert smack to
> standard linux lists") from the security-testing tree and commits
> c5b5a2a5e23a0056c76b2084ae2001e55816778a ("netlabel: Cleanup the
> Smack/NetLabel code to fix incoming TCP connections") and
> 174531a7a4f47f47dd706985d3d5e489fec87ab2 ("smack: Add a new '-CIPSO'
> option to the network address label configuration") from the lblnet tree.
>
> I fixed it up (see below - I am not entirely sure it is correct) and can
> carry the fix as necessary.
Thanks, I'll take care of it today. The problem is most likely due to the
"netlabel: Cleanup ..." patch as it needs to relocate the smack_host_label()
function higher in the source file as it is need earlier.
Also, just as a heads-up, I'm going to be posting the labeled networking
patches for 2.6.30 later this afternoon which should help in the future (they
are typically pulled in via James' security-testing tree).
--
paul moore
linux @ hp
next prev parent reply other threads:[~2009-03-27 16:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-27 5:19 linux-next: manual merge of the lblnet tree with the security-testing tree Stephen Rothwell
2009-03-27 16:32 ` Paul Moore [this message]
2009-03-28 0:21 ` 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=200903271232.53524.paul.moore@hp.com \
--to=paul.moore@hp$(echo .)com \
--cc=etienne.basset@numericable$(echo .)fr \
--cc=jmorris@namei$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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