linux-kernel - Re: [GIT PULL] Keyrings patches

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: <20130918115000.b78a5e79d65aa23ced0ac8e4@canb.auug.org.au>
Date:	Wed, 18 Sep 2013 11:50:00 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Howells <dhowells@...hat.com>
Cc:	James Morris <jmorris@...ei.org>, simo@...hat.com,
	zohar@...ux.vnet.ibm.com, keyrings@...ux-nfs.org,
	linux-security-module@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] Keyrings patches

Hi Dave,

On Tue, 17 Sep 2013 14:55:49 +0100 David Howells <dhowells@...hat.com> wrote:
>
> There's a slight change upstream that means that my patchset needs
> regenerating (the initconst changes).  Can you bring your -next branch up to
> date with linus/master so that I can rebase on top of it?

Is there some reason that those fixups cannot be done in a merge commit?
i.e. are they more than simple text updates?

/me thinks that most rebases people do can be better done (and
documented) as merges.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped