Re: [linux-sunxi] Re: Linus' tree (master) not working for Allwinner sun4i, sun5i, sun7i SoC-s + fix

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




Hi,

On 15-12-14 17:56, Maxime Ripard wrote:
Hi,

On Mon, Dec 15, 2014 at 05:30:04PM +0100, Hans de Goede wrote:
Hi Maxime,

Somehow this commit of your sunxi/clocks-for-3.19 branch has made it
into Linus' tree:

https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?h=sunxi/clocks-for-3.19&id=93746e70be83a3f113134a16065957b324af50f7

But this one has not:

https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?h=sunxi/clocks-for-3.19&id=acbcc0f03b15585387f9ca69c2a976b02cb69023

Rather badly breaking Allwinner sun4i, sun5i, sun7i SoC-s.

I don't know what you are looking at, but I don't see any of these
commits in Linus' current master, either in the git repo itself, or
using the kernel.org git interface.

They're both part of Mike Turquette's clk-next though, so they should
both land just fine whenever that will be merged.

Ah you're right, I had all patches from your sunxi/clocks-for-3.19 in my
local tree, and when rebasing on Linus' latest somehow the second one
got dropped on the rebase ?

I did not do any manual work on the rebase it went straight ahead, so
I don't understand how the patch got dropped. Anyways as you said
neither one is in Linus' tree atm, so this is not a problem, sorry
for the noise.

Regards,

Hans
--
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




[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]
  Powered by Linux