Subject: Re: linux-next: manual merge of the net tree

From: David Miller <[email-masked]>
Date: Tue, 28 Oct 2008 21:53:09 -0700 (PDT)

From: Stephen Rothwell <[email-masked]>
Date: Wed, 29 Oct 2008 14:11:23 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/p54/p54common.c between commit
> f2c2e25554991f9c17bcd24028db5e1c50ecb0ad ("p54: fix build warnings") from
> the net-current tree and commit e174961ca1a0b28f7abf0be47973ad57cb74e5f0
> ("net: convert print_mac to %pM") from the net tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix
> (hopefully only until net-current is merged into Linus' tree).

Yep, I'll merge after the next time net-current goes to Linus's tree.