| Message ID | 20170512235357.19486-1-ijc@hellion.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, May 13, 2017 at 12:53:57AM +0100, Ian Campbell wrote: > It not necessary and counter to how all the other files are done. > > It also happens to break the build in the split device tree repo > https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/ > > Signed-off-by: Ian Campbell <ijc@hellion.org.uk> > Cc: Brian Norris <briannorris@chromium.org> > Cc: Heiko Stuebner <heiko@sntech.de> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-rockchip@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts > index 658bb9dc9dfd..7bd31066399b 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts > @@ -44,7 +44,7 @@ > > /dts-v1/; > #include "rk3399-gru.dtsi" > -#include <include/dt-bindings/input/linux-event-codes.h> > +#include <dt-bindings/input/linux-event-codes.h> Whoops, didn't catch that when porting this to mainline. Thanks! Reviewed-by: Brian Norris <briannorris@chromium.org> > > /* > * Kevin-specific things > -- > 2.11.0 >
Hi Ian, Am Samstag, 13. Mai 2017, 00:53:57 CEST schrieb Ian Campbell: > It not necessary and counter to how all the other files are done. > > It also happens to break the build in the split device tree repo > https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/ > > Signed-off-by: Ian Campbell <ijc@hellion.org.uk> > Cc: Brian Norris <briannorris@chromium.org> > Cc: Heiko Stuebner <heiko@sntech.de> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-rockchip@lists.infradead.org > Cc: linux-kernel@vger.kernel.org that glitch also breaks Olof's patch [0] fixing a depmod symlink recursion in that it creates ../arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts:47:57: fatal error: include/dt-bindings/input/linux-event-codes.h: File or directory not found #include <include/dt-bindings/input/linux-event-codes.h> with only Olof's patch applied. So I guess both patches should go together with this one in front, so to be on the safe side, if some else is going to apply both: Reviewed-by: Heiko Stuebner <heiko@sntech.de> [0] https://www.spinics.net/lists/arm-kernel/msg580846.html
On Sat, 2017-05-13 at 17:43 +0200, Heiko Stuebner wrote: > Hi Ian, > > Am Samstag, 13. Mai 2017, 00:53:57 CEST schrieb Ian Campbell: > > It not necessary and counter to how all the other files are done. > > > > It also happens to break the build in the split device tree repo > > https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetr > > ee-rebasing.git/ > > > > Signed-off-by: Ian Campbell <ijc@hellion.org.uk> > > Cc: Brian Norris <briannorris@chromium.org> > > Cc: Heiko Stuebner <heiko@sntech.de> > > Cc: Rob Herring <robh+dt@kernel.org> > > Cc: Mark Rutland <mark.rutland@arm.com> > > Cc: Catalin Marinas <catalin.marinas@arm.com> > > Cc: Will Deacon <will.deacon@arm.com> > > Cc: linux-arm-kernel@lists.infradead.org > > Cc: linux-rockchip@lists.infradead.org > > Cc: linux-kernel@vger.kernel.org > > that glitch also breaks Olof's patch [0] fixing a depmod symlink > recursion in that it creates > > ../arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts:47:57: fatal > error: include/dt-bindings/input/linux-event-codes.h: File or > directory not found > #include <include/dt-bindings/input/linux-event-codes.h> > > with only Olof's patch applied. So I guess both patches should go > together with this one in front, so to be on the safe side, if some > else > is going to apply both: > > Reviewed-by: Heiko Stuebner <heiko@sntech.de> Not sure who should/wil merge this, but it seems I neglected to Cc Arnd and Olof so I'm doing so now. Would be good to get this in soonish. Ian
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts index 658bb9dc9dfd..7bd31066399b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts @@ -44,7 +44,7 @@ /dts-v1/; #include "rk3399-gru.dtsi" -#include <include/dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/input/linux-event-codes.h> /* * Kevin-specific things
It not necessary and counter to how all the other files are done. It also happens to break the build in the split device tree repo https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/ Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Cc: Brian Norris <briannorris@chromium.org> Cc: Heiko Stuebner <heiko@sntech.de> Cc: Rob Herring <robh+dt@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-rockchip@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)