Messages in this thread | | | Date | Fri, 7 Aug 2009 11:58:36 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net tree with Linus' tree |
| |
Hi Dave,
Today's linux-next merge of the net tree got a conflict in arch/microblaze/include/asm/socket.h between commit 81d8279ea31a3fc6d4ffacd87119a04c561ca62e ("microblaze: fall back on generic header files for the ABI") from Linus' tree and commits 49c794e94649020248e37b78db16cd25bad38b4f ("net: implement a SO_PROTOCOL getsockoption") and 0d6038ee76f2e06b79d0465807f67e86bf4025de ("net: implement a SO_DOMAIN getsockoption") from the net tree.
The former commit supercedes the latter ones, so I used that version. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |