[lkml]   [2014]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the akpm tree with the staging tree
Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/staging/emxx_udc/emxx_udc.c between commit 6de2a1a7b9e2
("staging: emxx_udc: Fix build error") from the staging tree and commit
"drivers/staging/emxx_udc/emxx_udc.c: replace strict_strto() with
kstrto()" from the akpm tree.

I fixed it up (I just used the version from the staging tree) and can
carry the fix as necessary (no action is required).

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2014-07-10 09:01    [W:0.044 / U:16.708 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site