Hi Stephen, On Wed, Jun 26, 2013 at 02:04:11AM +0100, Stephen Rothwell wrote: > Hi Lorenzo, > > Today's linux-next merge of the arm-mpidr tree got a conflict in > arch/arm/kernel/suspend.c between commit 7604537bbb57 ("ARM: kernel: > implement stack pointer save array through MPIDR hashing") from the arm > tree and commit 3fed6a1e3bf0 ("ARM: kernel: implement stack pointer save > array through MPIDR hashing") from the arm-mpidr tree. > > The former is just a rebase of the latter, so I used it. It then turns > out that the arm-mpidr contains nothing that is not already included in > the arm tree, so is it needed any more i.e. is there further work coming?
No, arm-mpidr can be dropped from -next now that those patches, as you correctly mentioned, are queued through the arm tree. Thank you very much indeed, Lorenzo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/