linux-kernel - Re: [GIT] Security subsystem changes for 3.1

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CA+55aFyyROrBFuwKTWkEWpe=iF=E68bQicQcBpTFrx6Bj2RaBw@mail.gmail.com>
Date:	Wed, 27 Jul 2011 19:57:26 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	James Morris <jmorris@...ei.org>
Cc:	linux-security-module@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT] Security subsystem changes for 3.1

On Wed, Jul 27, 2011 at 7:42 PM, James Morris <jmorris@...ei.org> wrote:
>
> Ok, but this conflict was in my subsystem.

.. but it was a conflict that came from the VFS subsystem changes.

So it was clearly a cross-subsystem conflict. The fact that the file
was in what you consider your subsystem IS TOTALLY IRRELEVANT. Because
clearly somebody ELSE considered the change that conflicted to be part
of THEIR subsystem!

See?

So by definition, if you get conflicts with something that has come
into my tree from somebody else, then it is a cross-subsystem
conflict. What file it happens in (and whether you consider it "your"
file or not) is entirely irrelevant - because the important part is
that two different maintainers worked on the same area. That's the
definition of 'cross-subsystem conflict'.

In contrast, if you merge two different branches that you yourself
maintain, and have conflicts there, that's an "internal" conflict as
far as maintenance is concerned. I don't particularly care about those
internal conflicts, but you might want to talk to the people you work
with if you have lots of them..

                      Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/