linux-kernel - Re: linux-next: build failure after merge of the net-next tree

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]

Message-Id: <20150324.115915.829626973555093278.davem@davemloft.net>
Date:	Tue, 24 Mar 2015 11:59:15 -0400 (EDT)
From:	David Miller <davem@...emloft.net>
To:	hch@....de
Cc:	sfr@...b.auug.org.au, netdev@...r.kernel.org,
	viro@...IV.linux.org.uk, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, tadeusz.struk@...el.com
Subject: Re: linux-next: build failure after merge of the net-next tree

From: Christoph Hellwig <hch@....de>
Date: Tue, 24 Mar 2015 11:43:46 +0100

> On Mon, Mar 23, 2015 at 11:00:03PM -0400, David Miller wrote:
>> Ok, more conflicts wiht Al's vfs work.
>> 
>> This is starting to pile on, heavily...
> 
> These are my changes.  But I think it would be much better if any aio-related
> changes like this one we be one on top of my changes in Al's iocb branch,
> there have been various changes, and it would be better to review and
> commit the changes on top of it instead of carrying the changes as fixups.
> 
> Nevermind the actual test coverage..

That's no longer possible as my tree never rebases and the commits are pushed
out already.

Another solution to this set of conflicts, is therefore necessary.
--
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/