On Mon, Oct 10, 2016 at 5:21 PM, Jeremy McNicoll <jmcnicol@xxxxxxxxxx> wrote: > On 2016-10-08 6:28 PM, Rob Herring wrote: >> >> On Sat, Oct 01, 2016 at 07:38:36PM -0700, Jeremy McNicoll wrote: >>> >>> Given that this is a MSM SoC and not a specific vendor created >>> SoC moving associated device tree files to qcom directory. >>> >>> Signed-off-by: Jeremy McNicoll <jeremymc@xxxxxxxxxx> >>> --- >>> arch/arm64/boot/dts/huawei/Makefile | 5 >>> ----- >>> arch/arm64/boot/dts/qcom/Makefile | 4 ++-- >>> arch/arm64/boot/dts/{huawei => qcom}/msm8994-angler-rev-101.dts | 2 +- >> >> >> What tree are you based on? There's no huawei dir in mainline. You need >> to rebase everything. > > > One change was made to 8/12 and explicitly documented, unfortunately the > list was getting long. A way to deal with this situation was discussed on > IRC with a few people regarding the best way to deal with this, and this is > how they instructed me to deal with this type of scenario. You are not changing anything important here. Squash this, maintain the original author, and just note that you moved the location before your signoff. No one wants to see the original out of tree code. Rob -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html