On Wed, May 29, 2013 at 02:14:22PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/silicom/bpctl_mod.c between commit 351638e7deee ("net:
> pass info struct via netdevice notifier") from the net-next tree and
> commit f84b075178b4 ("Staging: silicom: Fixed error 'do not initialise
> statics to 0 or NULL'") from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
The fix looks great, thanks.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
