ons 2014-02-12 klockan 11:44 +0100 skrev Marek Vasut:

> The current u-boot-sunxi is completely un-rebasable as far as I can tell.

Indeed. It's an incremental branch over a very long time with repeated
merges from master.

The sunxi-patchqueue branch should be considerably easier to rebase, but
it lags behind a bit as I haven't had time to update it since august.

The normal work procedure is that changes are cherry-picked from sunxi
to sunxi-patchqueue, then squashed into their relevant patchsets and
whole patchset rebased. Then diffed to sunxi to make sure the two are
aligned (minus some stuff that is not meant to be mainlined)

Regards
Henrik


-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to