Re: linux-next: manual merge of the net tree with the net-currenttree

[Stephen Rothwell]

Hi Dave,

On Sun, 22 Nov 2009 17:19:32 -0800 (PST) David Miller <davem@xxxxxxxxxxxxx> wrote:
>
> Hmmm... I specifically remember taking core of this conflict when I
> merged net-next-2.6 into net-2.6 yesterday or the day before.

These are the trees I picked up from master.kernel.org this morning:

$ git branch -r -v | grep '^ *net'
  net-current/master                                  5d09e53 netxen : fix BOND_MODE_TLB/ALB mode.
  net/master                                          e994b7c tcp: Don't make syn cookies initial setting depend on CONFIG_SYSCTL

commit e994b7c901ded7200b525a707c6da71f2cf6d4bb
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date:   Sat Nov 21 11:22:25 2009 -0800

Did you push them out?  master was down for a while yesterday ...

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature