Re: linux-next: build failure after merge of the slave-dma tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: build failure after merge of the slave-dma tree
Date	2015-10-15 06:00 +0200
Message-ID	<qjHRT-2W8-7@gated-at.bofh.it> (permalink)
References	<qjF3H-7eR-3@gated-at.bofh.it> <qjHyx-2yL-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Vinod,

On Thu, 15 Oct 2015 03:35:42 +0000 "Koul, Vinod" <vinod.koul@intel.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.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Thread

linux-next: build failure after merge of the slave-dma tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-15 03:00 +0200
  Re: linux-next: build failure after merge of the slave-dma tree "Koul, Vinod" <vinod.koul@intel.com> - 2015-10-15 05:40 +0200
    Re: linux-next: build failure after merge of the slave-dma tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-15 06:00 +0200
      Re: linux-next: build failure after merge of the slave-dma tree Arnd Bergmann <arnd@arndb.de> - 2015-10-15 16:10 +0200
        Re: linux-next: build failure after merge of the slave-dma tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-15 16:30 +0200

csiph-web