Messages in this thread | | | Date | Thu, 10 Jul 2014 09:12:05 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the akpm tree with the staging tree |
| |
On Thu, Jul 10, 2014 at 04:27:50PM +1000, Stephen Rothwell wrote: > 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).
Sounds good, thanks.
greg k-h
| |