public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PULL] Pull request u-boot-atmel.git next
Date: Tue, 17 May 2011 13:09:55 +0200	[thread overview]
Message-ID: <4DD25783.7080509@aribaud.net> (raw)
In-Reply-To: <4DD17B3C.2010905@emk-elektronik.de>

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.

  reply	other threads:[~2011-05-17 11:09 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-13  8:46 [U-Boot] [PULL] Pull request u-boot-atmel.git next Reinhard Meyer
2011-05-16 11:20 ` Albert ARIBAUD
2011-05-16 19:30   ` Reinhard Meyer
2011-05-17 11:09     ` Albert ARIBAUD [this message]
2011-05-17 15:34       ` Reinhard Meyer
2011-05-17 15:52         ` Albert ARIBAUD
2011-05-17 16:44           ` Reinhard Meyer
2011-05-18  6:03             ` Albert ARIBAUD

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4DD25783.7080509@aribaud.net \
    --to=albert.u.boot@aribaud.net \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox