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

[Joe Perches <joe@perches.com>]

On Mon, 2011-09-19 at 09:55 +0300, Dmitry Kravkov wrote:
> On Sun, 2011-09-18 at 21:51 -0700, Stephen Rothwell wrote:
> > Today's linux-next merge of the net tree got a conflict in
> > drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c between commit
> > c482e6c06461 ("bnx2x: Fix ETS bandwidth") from Linus' tree and commit
> > 94f05b0f60de ("bnx2x: Coalesce pr_cont uses and fix DP typos") from the
> > net tree.
[]
> Can you use this one instead?
> Contains spell fixes and some formatting.

Hey Dmitry.

The toatl/total spelling fix is good,
but I think this isn't better and is
in fact worse.

> diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
> index 8e9b87b..733ace0 100644
> --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
> +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
> @@ -850,32 +850,24 @@ static int bnx2x_ets_e3b0_get_total_bw(
[]
> -			DP(NETIF_MSG_LINK,
> -			   "bnx2x_ets_E3B0_config toatl BW shouldn't be 0\n");
> +			DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config total BW"
> +					   "shouldn't be 0\n");

Multiple line format strings lines are bad style and error prone.
You introduce broken spacing after string coalescing.

> -		DP(NETIF_MSG_LINK,
> -		   "bnx2x_ets_E3B0_config toatl BW should be 100\n");
> -		/**
> -		*   We can handle a case whre the BW isn't 100 this can happen
> -		*   if the TC are joined.
> -		*/
> +		DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config total BW should be"
> +				   "100\n");

Here too.