Hi Rienhard, Le 16/05/2011 21:30, Reinhard Meyer a écrit : > Dear Albert, >> Hi Reinhard, >> >> Le 13/05/2011 10:46, Reinhard Meyer a écrit : >>> Dear Albert, >>> >>> The following changes since commit >>> 2e73808ee97d75400881d1fe144b062f427cfcb9: >>> Clint Adams (1): >>> Enable multiple fs options for Marvell SoC family on OpenRD boards >>> >>> are available in the git repository at: >>> >>> git://git.denx.de/u-boot-atmel.git next >> >> Do you mean for me to pull this into my master branch? If so, I would >> prefer that you rebase your master branch on next and send a pull >> request for your master. > > I don't understand the issue here: > > arm:master = arm:next = atmel:master are identical already. > > atmel:next is all that has been added since that. > > Should be simple to pull that onto arm:master?
Yes, it is even trivial; but I expect pull request to be from 'master' branches, which contain patches accepted by the custodian for the upcoming version, not from 'next' branches, which are a waiting queue for patches that will only go into the next merge window -- as per <http://www.denx.de/wiki/view/U-Boot/CustodianGitTrees#Tips_for_maintaining_custodian_t> > Best Regards, > > Reinhard Amicalement, -- Albert. _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
