On Tue, Apr 18, 2017 at 12:43 PM, Maxime Ripard <maxime.rip...@free-electrons.com> wrote: > On Tue, Apr 18, 2017 at 10:38:19AM +0530, Jagan Teki wrote: >> On Tue, Apr 4, 2017 at 5:04 PM, Maxime Ripard >> <maxime.rip...@free-electrons.com> wrote: >> > 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.rip...@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? >> >> Now master, is up-to-date. Please rebase and send the series again. > > Yet, the patches are in your next branch. Could you *please* give some > explanation of what you're doing with these branches?
Patches from -next were unable to merge, so better to send the series again on top of master. The reason for master-pr for sending local branch with buildman setup I would usually create local branches for buildman which will send as PR, but this will remove once PR passed. Now all clean, we have master and next. thanks! -- Jagan Teki Free Software Engineer | www.openedev.com U-Boot, Linux | Upstream Maintainer Hyderabad, India. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
