Hi Simon,
On Fri, Mar 16, 2018 at 5:32 PM, Simon Horman <horms@xxxxxxxxxxxx> wrote:
> On Fri, Mar 16, 2018 at 03:53:09PM +0100, Simon Horman wrote:
>> Please consider these Renesas ARM based SoC DT updates for v4.17.
>
> Unfortunately there seems to be a small problem with this pull request.
>
> "ARM: dts: r7s72100: add USB device to device tree" is already
> present upstream via Greg KH.
It is no longer present upstream, as it was reverted by Greg to avoid
conflicts.
Interestingly, "git log" doesn't show it:
$ git log --oneline v4.15..v4.16-rc1 -- arch/arm/boot/dts/r7s72100.dtsi
$
unless you explicitly mention the commit that created it:
$ git log --oneline v4.15..8a99b6ad4da2f90969bb2ebb426c1d3dd0089fa4 --
arch/arm/boot/dts/r7s72100.dtsi
8a99b6ad4da2f909 ARM: dts: r7s72100: add USB device to device tree
$
or reverted it:
$ git log --oneline v4.15..9836c09442c249b8e4f9646090d3259001cad432 --
arch/arm/boot/dts/r7s72100.dtsi
9836c09442c249b8 Revert "ARM: dts: r7s72100: add USB device to device tree"
8a99b6ad4da2f909 ARM: dts: r7s72100: add USB device to device tree
$
(both are in v4.16-rc1).
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
