Messages in this thread | | | Date | Thu, 7 Jul 2011 06:42:29 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the ux500-core tree |
| |
On Thu, Jul 07, 2011 at 03:42:23PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > arch/arm/mach-ux500/board-mop500-u8500uib.c between commit 0df7aaf0f276 > ("mach-ux500: fix build error due to unknown 'regulator_en' field") from > the ux500-core tree and commit 857f727674f4 ("staging: ste_rmi4: remove > cross-dependent platform data") from the staging tree. > > The second supercedes the first, so I used that.
That sounds correct, thanks for doing this.
greg k-h
| |