Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1299546 > unrolled thread

linux-next: manual merge of the libata tree

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the libata tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-31 02:30 +0100
    Re: linux-next: manual merge of the libata tree Tejun Heo <tj@kernel.org> - 2016-01-01 03:10 +0100

#1299546 — linux-next: manual merge of the libata tree

Hi Tejun,

Today's linux-next merge of the libata tree got conflicts all over teh
place due to commit:

  53fab927a8fc ("ata: ahci_brcmstb: add support for MIPS-based platforms")

from the libata tree which seem to contain most (if not all) of Linus'
tree :-(.

I have used the version of the libata tree from next-20151223 for today.

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

[toc] | [next] | [standalone]

#1299819

Hello, Stephen.

On Thu, Dec 31, 2015 at 12:29:15PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the libata tree got conflicts all over teh
> place due to commit:
> 
>   53fab927a8fc ("ata: ahci_brcmstb: add support for MIPS-based platforms")
> 
> from the libata tree which seem to contain most (if not all) of Linus'
> tree :-(.

That's me messing up the branch.  Will rebase the tree.  Sorry about
the mess.

Thanks.

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web