Messages in this thread | | | Date | Tue, 26 Nov 2013 19:20:28 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the staging.current tree |
| |
On Wed, Nov 27, 2013 at 01:01:44PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got conflicts in > drivers/staging/tidspbridge/pmgr/cmm.c, > drivers/staging/tidspbridge/pmgr/dbll.c, > drivers/staging/tidspbridge/pmgr/dev.c, > drivers/staging/tidspbridge/pmgr/dmm.c and > drivers/staging/tidspbridge/pmgr/dspapi.c between commit cb45065428b7 > ("staging: delete tidspbridge driver") from the staging.current tree and > various commits from the staging tree. > > I just removed the files and can carry the fix as necessary (no action > is required).
Thanks, that is the correct thing.
greg k-h
| |