From: Randy Dunlap <rdunlap@infradead.org>
To: Paul Moore <paul@paul-moore.com>
Cc: akpm@linux-foundation.org, broonie@kernel.org,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, linux-next@vger.kernel.org, mhocko@suse.cz,
mm-commits@vger.kernel.org, sfr@canb.auug.org.au,
linux-security-module <linux-security-module@vger.kernel.org>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>
Subject: Re: mmotm 2020-01-28-20-05 uploaded (security/security.c)
Date: Wed, 29 Jan 2020 08:02:57 -0800 [thread overview]
Message-ID: <30511826-765f-6b10-7bad-b950b3941295@infradead.org> (raw)
In-Reply-To: <CAHC9VhRW68ccE_8HJnv4anFdSgkY2Yk3612LPCT5o4+vXQGqQA@mail.gmail.com>
On 1/29/20 5:51 AM, Paul Moore wrote:
> On Tue, Jan 28, 2020 at 11:52 PM Randy Dunlap <rdunlap@infradead.org> wrote:
>> On 1/28/20 8:06 PM, akpm@linux-foundation.org wrote:
>>> The mm-of-the-moment snapshot 2020-01-28-20-05 has been uploaded to
>>>
>>> http://www.ozlabs.org/~akpm/mmotm/
>>>
>>> mmotm-readme.txt says
>>>
>>> README for mm-of-the-moment:
>>>
>>> http://www.ozlabs.org/~akpm/mmotm/
>>>
>>> This is a snapshot of my -mm patch queue. Uploaded at random hopefully
>>> more than once a week.
>>>
>>
>> security/security.c contains duplicate lines for <lockdown_reasons> array:
>
> Hmmm. Commit 59438b46471a ("security,lockdown,selinux: implement
> SELinux lockdown"), which was merged into Linus' tree during the
> current merge window, moved the lockdown_reasons array from
> security/lockdown/lockdown.c to security/security.c; is there another
> tree in linux-next which is moving lockdown_reasons into
> security/security.c?
>
Somehow in mmotm those lines of code were merged 2x:
once from origin.patch and once from linux-next.patch.
Looks more like a mmotm merge issue, not a security/ issue.
--
~Randy
next prev parent reply other threads:[~2020-01-29 16:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-29 4:06 mmotm 2020-01-28-20-05 uploaded akpm
2020-01-29 4:39 ` mmotm 2020-01-28-20-05 uploaded (net/mptcp/subflow.c) Randy Dunlap
2020-01-29 4:52 ` mmotm 2020-01-28-20-05 uploaded (security/security.c) Randy Dunlap
2020-01-29 13:51 ` Paul Moore
2020-01-29 16:02 ` Randy Dunlap [this message]
2020-01-29 22:32 ` Stephen Rothwell
2020-01-29 16:43 ` mmotm 2020-01-28-20-05 uploaded (objtool warnings) Randy Dunlap
2020-01-29 17:19 ` Josh Poimboeuf
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=30511826-765f-6b10-7bad-b950b3941295@infradead.org \
--to=rdunlap@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=jmorris@namei.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mhocko@suse.cz \
--cc=mm-commits@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=serge@hallyn.com \
--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).