Messages in this thread | | | Date | Wed, 2 May 2012 14:23:04 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with Linus' tree |
| |
On Fri, Apr 27, 2012 at 02:37:03PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/vt6656/ioctl.c between commit 17b7e1ba1e2e ("staging: > vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl > ()") from Linus' tree and commit 62ef30b5781d ("staging: vt6656: Remove > redundant casts from ioctl.c") from the staging tree. > > I fixed it up (see below) and can carry the fix as necessary.
This should now be resolved, thanks.
greg k-h
| |