linux-kernel - Re: linux-next: recent rebases

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] [day] [month] [year] [list]

Date:	Wed, 12 Dec 2012 09:19:45 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Eric Paris <eparis@...hat.com>
Cc:	Linus <torvalds@...ux-foundation.org>, linux-next@...r.kernel.org,
	LKML <linux-kernel@...r.kernel.org>,
	Jaegeuk Kim <jaegeuk.kim@...sung.com>,
	Marek Szyprowski <m.szyprowski@...sung.com>,
	Kyungmin Park <kyungmin.park@...sung.com>,
	Kees Cook <keescook@...gle.com>
Subject: Re: linux-next: recent rebases

Hi Eric,

On Tue, 11 Dec 2012 16:58:43 -0500 Eric Paris <eparis@...hat.com> wrote:
>
> On Wed, 2012-12-12 at 08:41 +1100, Stephen Rothwell wrote:
> > 
> > fsnotify: rebased to v3.6(!) to resolve a conflict.
> > 	git://git.infradead.org/users/eparis/notify.git#for-next
> 
> I planned to let it sit in -next until at least next thursday before I
> sent a pull request.  Thought that fit within the rules...

No worries, just noting.  Though you could have just done a merge against
v3.6 with an explanation in the merge changelog of why it was done.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped