On 1/29/20 5:51 AM, Paul Moore wrote: > On Tue, Jan 28, 2020 at 11:52 PM Randy Dunlap <rdunlap@xxxxxxxxxxxxx> wrote: >> On 1/28/20 8:06 PM, akpm@xxxxxxxxxxxxxxxxxxxx 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
