From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PULL] u-boot-pxa / fix
Date: Thu, 01 Mar 2012 23:05:16 +0100 [thread overview]
Message-ID: <4F4FF29C.60102@aribaud.net> (raw)
In-Reply-To: <201202292238.04414.marex@denx.de>
Hi Marek,
Le 29/02/2012 22:38, Marek Vasut a ?crit :
>> Hi Marek,
>>
>> Le 27/02/2012 21:53, Marek Vasut a ?crit :
>>>> Hi Marek,
>>>>
>>>> Le 27/02/2012 14:03, Marek Vasut a ?crit :
>>>>> The following changes since commit
> 417c2c787e32784b5de975065a7d1dd5b3cc8ecd:
>>>>> at91: modified NAND flash timing on otc570 board (2012-02-20
>>>>> 09:00:13 +0100)
>>>>>
>>>>> are available in the git repository at:
>>>>> git://git.denx.de/u-boot-pxa.git fix
>>>>>
>>>>> for you to fetch changes up to 2e85d5c10f01b21ac47f9b0dd4a9dcc022ac0be6:
>>>>> PXA: Fix missing get_tbclk() breaking vpac boards (2012-02-27
>>>>> 13:59:47 +0100)
>>>>>
>>>>> ----------------------------------------------------------------
>>>>>
>>>>> Marek Vasut (3):
>>>>> PXA: Remove PXA PCMCIA support
>>>>> PXA: Fix warning in zipitz2
>>>>> PXA: Fix missing get_tbclk() breaking vpac boards
>>>>>
>>>>> Simon Glass (1):
>>>>> arm: Remove jornada link script
>>>>>
>>>>> Vasily Khoruzhick (2):
>>>>> zipitz2: fix boot issue introduced by PXA low level init rework
>>>>> zipitz2: use pxa_mmc_gen as MMC driver
>>>>>
>>>>> arch/arm/cpu/pxa/timer.c | 5 ++
>>>>> board/jornada/u-boot.lds | 58 ---------------------------
>>>>> board/zipitz2/zipitz2.c | 9 ++++
>>>>> doc/README.PXA_CF | 56 --------------------------
>>>>> drivers/pcmcia/Makefile | 1 -
>>>>> drivers/pcmcia/pxa_pcmcia.c | 93
>>>>> -------------------------------------------
>>>>> include/configs/zipitz2.h
>>>>>
>>>>> | 14 +++++-
>>>>>
>>>>> include/pcmcia.h | 3 +-
>>>>> 8 files changed, 26 insertions(+), 213 deletions(-)
>>>>> delete mode 100644 board/jornada/u-boot.lds
>>>>> delete mode 100644 doc/README.PXA_CF
>>>>> delete mode 100644 drivers/pcmcia/pxa_pcmcia.c
>>>>
>>>> Is there a reason why this pull request is on a "fix" branch, not
>>>> "master"?
>>>>
>>>> Amicalement,
>>>
>>> Since those are mostly fixes.
>>
>> My meaning was, if they are fixes, then why are they not on
>> u-boot-pxa/master as they should be?
>
> Because I'm an evil maintainer that is very happy if he can bring in
> inconsistency ! I'll put it into master next time.
Please meet the evil arch-custodian that is very happy if he can impose
order. :)
More seriously though: do you mean you are going to move these commits
to master and send an updated pull req, or should take this one as being
master?
> Cheers!
> M
Amicalement,
--
Albert.
next prev parent reply other threads:[~2012-03-01 22:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-27 13:03 [U-Boot] [PULL] u-boot-pxa / fix Marek Vasut
2012-02-27 20:16 ` Albert ARIBAUD
2012-02-27 20:53 ` Marek Vasut
2012-02-28 21:16 ` Albert ARIBAUD
2012-02-29 21:38 ` Marek Vasut
2012-03-01 22:05 ` Albert ARIBAUD [this message]
2012-03-02 10:47 ` Marek Vasut
2012-03-05 6:01 ` Marek Vasut
2012-03-05 12:19 ` Albert ARIBAUD
2012-03-05 12:39 ` Marek Vasut
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=4F4FF29C.60102@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.