Messages in this thread | | | Date | Thu, 02 May 2013 09:25:39 +0800 | From | Chen Gang <> | Subject | Re: linux-next: manual merge of the net-next tree with the net tree |
| |
On 2013年04月30日 10:24, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in > net/mac802154/mac802154.h between commit 2c1bbbffa0b6 ("net: mac802154: > comparision issue of type cast, finding by EXTRA_CFLAGS=-W") from the net > tree and commit 7dd43d356e73 ("mac802154: Do not try to resend failed > packets") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Thanks
-- Chen Gang
Asianux Corporation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |