linux-kernel - Re: linux-next: build failure after merge of the slave-dma 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <5852722.yfOrjUKMax@wuerfel>
Date:	Thu, 15 Oct 2015 16:07:51 +0200
From:	Arnd Bergmann <arnd@...db.de>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	"Koul, Vinod" <vinod.koul@...el.com>, "hch@....de" <hch@....de>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"andriy.shevchenko@...ux.intel.com" 
	<andriy.shevchenko@...ux.intel.com>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the slave-dma tree

On Thursday 15 October 2015 14:51:42 Stephen Rothwell wrote:
> Hi Vinod,
> 
> On Thu, 15 Oct 2015 03:35:42 +0000 "Koul, Vinod" <vinod.koul@...el.com> wrote:
> >
> > So should I ask Linus to apply this fix once merge window opens or you will send
> > this, how do we go about fixing this one 
> > 
> > Or should I merge the above commit from asm-generic tree?
> 
> Up to you.  Though you should only merge fro mthe asm-generic tree if
> the maintainer guarantees it will not be rebased.
> 
> You could just wait and tell Linus that this fixup is needed when the
> two trees are merged.  It really need to go into the merge commit to
> avoid bisection problems.
> 

I've added a workaround to the asm-generic tree, no need to worry about
it for now. We can change over the remaining users of
asm-generic/io-64-nonatomic-lo-hi.h for the following merge window and
then remove the wrapper.

	Arnd
--
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/