2013-09-03 23:55:30

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build warning after merge of the pci tree

Hi Bjorn,

You have sent a pull request to Linus for the pci tree, but at the same
time you have reset the branch I pull into linux-next to be v3.11. So
you have effectively removed all that code from linux-next until Linus'
merges it :-(

Ordering is important.
--
Cheers,
Stephen Rothwell [email protected]


Attachments:
(No filename) (333.00 B)
(No filename) (836.00 B)
Download all attachments

2013-09-04 00:00:11

by Bjorn Helgaas

[permalink] [raw]
Subject: Re: linux-next: build warning after merge of the pci tree

On Tue, Sep 3, 2013 at 5:55 PM, Stephen Rothwell <[email protected]> wrote:
> Hi Bjorn,
>
> You have sent a pull request to Linus for the pci tree, but at the same
> time you have reset the branch I pull into linux-next to be v3.11. So
> you have effectively removed all that code from linux-next until Linus'
> merges it :-(
>
> Ordering is important.

Oops, sorry about that!. I jumped the gun because I forgot about your
dependency on that branch (stupid, I know, since that's the whole
point of it). Next time I'll wait until after Linus pulls my tag.

Bjorn