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: <AANLkTik1kxC_GBKYSvhAK6_O0Bt-ALbEP3T=+AmMQRLP@mail.gmail.com>
Date:	Mon, 10 Jan 2011 14:55:41 -0800
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 2.6.38

On Mon, Jan 10, 2011 at 1:56 PM, James Morris <jmorris@...ei.org> wrote:
>
> In these cases it's my local 'master', which is tracking your tree.  I'll
> look at renaming that or creating a new branch called linus-master.

That doesn't much help. It now says the source, but still gives no
indication _why_ you pulled.

If you want to sync up, use a tag or something. Then it actually makes
sense, and a merge message like "Merge tag 'v2.6.36-rc7'" actually
makes sense.

But "Merge branch 'linus-master'" just makes me (and anybody else) go
"why did the security tree merge some random daily thing"?

                 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/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ