[U-Boot] [PATCH v3 0/9] sunxi: Remove SYS_EXTRA_OPTIONS

[Maxime Ripard]

On Tue, Apr 04, 2017 at 03:26:55PM +0530, Jagan Teki wrote:
> On Tue, Apr 4, 2017 at 3:11 PM, Maxime Ripard
> <maxime.ripard at free-electrons.com> wrote:
> > On Tue, Apr 04, 2017 at 02:25:09PM +0530, Jagan Teki wrote:
> >> On Tuesday 04 April 2017 01:42 PM, Maxime Ripard wrote:
> >> > Hi,
> >> >
> >> > On Sun, Apr 02, 2017 at 12:59:02PM +0200, Mylène Josserand wrote:
> >> > > This a V3 for my patchset that removes the SYS_EXTRA_OPTIONS from all
> >> > > sunxi defconfigs.
> >> > > The values in this variable are converted to Kconfig or simply removed.
> >> > >
> >> > > Based on u-boot sunxi repository: git://git.denx.de/u-boot-sunxi.git
> >> > > "master" branch, from last commit: 6f72a951cdd07e3f9d214b189762b978cd2acf45
> >> >
> >> > Thanks for sending this again.
> >> >
> >> > There was a build breakage for all the non-sunxi boards in your last
> >> > patch. I've fixed it by adding a depends on ARCH_SUNXI to avoid
> >> > multiple definitions of CONS_INDEX on the other architectures, and
> >> > applied it.
> >>
> >> These need to to send-again on top of master-pr, I'm running buildman on top
> >> of u-boot/master with sunxi/master changes. Observed errors while applying
> >> these 9 patches,
> >
> > I ran buildman on the patches that have been pushed, there's no
> > errors, which errors did you encounter.
> >
> > The branches are kind of weird too, afaik, there's three of them,
> > master, master-pr (that has been created today), master-next (that has
> > kind of the same patches than master, but doesn't share the same
> > history for some reason) and next (with yet again a different set of
> > patches than master, but definitely not the same than master-next).
> >
> > Can we agree on *one* branch to push patches too?
> 
> [1] these are buildman issues, I rebased master with sunxi/master and
> ran the buildman.

See the answers from Chen-Yu, those issues are already fixed.

> Now, re-arranged and squashed few commits and running master-pr, once
> this is fine I will copy this as master and send the PR.
> So-that we can apply patches on top of this.

So, where am I supposed to apply patches? master, master-pr, next,
master-next? What are those branches for?

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170404/7653c7af/attachment.sig>