* Olof Johansson <olof@xxxxxxxxx> [120920 16:23]: > On Wed, Sep 19, 2012 at 10:56 PM, Shilimkar, Santosh > <santosh.shilimkar@xxxxxx> wrote: > > On Thu, Sep 20, 2012 at 12:27 AM, Arnd Bergmann <arnd@xxxxxxxx> wrote: > >> On Monday 17 September 2012, Tony Lindgren wrote: > >>> * Santosh Shilimkar <santosh.shilimkar@xxxxxx> [120914 02:21]: > >>> > OMAP interconnect drivers are used for the interconnect error handling. > >>> > Since they are bus driver, lets move it to newly created drivers/bus. > >>> > > >>> > Cc: Arnd Bergmann <arnd@xxxxxxxx> > >>> > Cc: Tony Lindgren <tony@xxxxxxxxxxx> > >>> > Tested-by: Lokesh Vutla <lokeshvutla@xxxxxx> > >>> > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx> > >>> > --- > >>> > Patch just moves OMAP interconnect drivers as is to the newly created > >>> > driver/bus/* directory. Patch is generated against "arm-soc/drivers/ocp2scp" > >>> > tree and test on all OMAP boards. > >>> > >>> Great, looks like this should not conflict with other > >>> omap patches queued, so Arnd should probably take this into > >>> the bus branch: > >>> > >>> Acked-by: Tony Lindgren <tony@xxxxxxxxxxx> > >> > >> It turns out that the patch actually did conflict and we now have a broken > >> omap2plus_defconfig. The patch below seems to fix it, but please verify > >> that this makes sense. > >> > >> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> > >> > > Looks correct. > > > > Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx> > > I ended up applying something very similar to this and carried the > ACKs on that, but I broke it up in two pieces; one for the > drivers/ocp2scp branch to fix the irq numbers, and another to just > for-next to deal with the soc.h include file (since that should > probably have been fixed at branch merge time). > > Pushed out to for-next as well. OK thanks! Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html