Messages in this thread | | | From | Niklaus Giger <> | Subject | Re: linux-next: manual merge of the net tree with the tree | Date | Tue, 23 Aug 2011 20:10:44 +0200 |
| |
> Hi all, > > Today's linux-next merge of the net tree got a conflict in > arch/powerpc/configs/40x/hcu4_defconfig between commit 9fcd768d0cc8 > ("powerpc/40x: Remove obsolete HCU4 board") from the 4xx tree and commit > 3b3bceef26f8 ("net: fix IBM EMAC driver after rename") from the net tree. > > The former commit removes the file, so I just did that. Thanks!
Best regards
| |