Hi Dave,
On Sun, 13 Sep 2009 21:46:44 -0700 (PDT) David Miller <davem@xxxxxxxxxxxxx> wrote:
>
> Ok, since I already sent a merge request to Linus I'll submit this
> as soon as he does that pull.
>
> I don't like "slipping" in things to a tree I've already asked
> him to pull from, and in this case especially since I'd have
> to merge his tree in to keep net-next-2.6 itself building.
> :-)
You might like to send him an email pointing out this merge fix, as when
he merges your tree, it will fail to build tun ... and, if he is told, he
can put this fix in the merge commit so there is no bisection breakage.
This is all presuming that commit
89f56d1e91cfa535ccc6cc60e9e12e02682fd972 ("tun: reuse struct sock
fields") is in the tree you asked him to pull.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpOMNfO5idCY.pgp
Description: PGP signature
