From: Felipe Balbi <balbi@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] Please pull u-boot-dm.git branch for-tom
Date: Fri, 26 Sep 2014 19:57:03 -0500 [thread overview]
Message-ID: <20140927005703.GC25432@saruman> (raw)
In-Reply-To: <CAPnjgZ0ZVr+mriA7dtZ4gD+EMijPHYCNywu6QWYERcGu20mhAA@mail.gmail.com>
On Fri, Sep 26, 2014 at 05:52:11PM -0600, Simon Glass wrote:
> Hi Tom,
>
> Here are the changes that were reviewed by Jagan (SPI maintainer).
>
> Branch is 'for-tom' as I had trouble with master (see below).
>
> The following changes since commit f9860cf081efdf32c8a01b9fc271fe55e2a79f8d:
>
> nand/denali: Document CONFIG symbols (2014-09-25 13:54:58 -0500)
>
> are available in the git repository at:
>
> git://git.denx.de/u-boot-dm.git
>
> for you to fetch changes up to 248a0488bfbb2eb16dee408a976d5f4b5546bb51:
>
> spi: Add brackets and tidy defines in spi.h (2014-09-26 15:01:15 -0600)
>
> ----------------------------------------------------------------
> Simon Glass (4):
> sandbox: Convert SPI flash emulation to use sf_params
> sandbox: config: Enable all SPI flash chips
> dm: spi: Move cmd device code into its own function
> spi: Add brackets and tidy defines in spi.h
>
> common/cmd_spi.c | 53
> ++++++++++++++++++++++++++++++++---------------------
> drivers/mtd/spi/sandbox.c | 114
> ++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------
> include/configs/sandbox.h | 8 +++++++-
> include/spi.h | 24 ++++++++++++------------
> 4 files changed, 89 insertions(+), 110 deletions(-)
>
>
> Here's the error I got with master:
>
> git push dm HEAD:master
> Counting objects: 19, done.
> Delta compression using up to 32 threads.
> Compressing objects: 100% (19/19), done.
> Writing objects: 100% (19/19), 3.19 KiB | 0 bytes/s, done.
> Total 19 (delta 15), reused 0 (delta 0)
> remote: error: refusing to update checked out branch: refs/heads/master
why isn't u-boot-dm.git a bare repository ? Seems like you have
refs/heads/master checked out. Odd.
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140926/cf108cdf/attachment.pgp>
next prev parent reply other threads:[~2014-09-27 0:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-26 23:52 [U-Boot] Please pull u-boot-dm.git branch for-tom Simon Glass
2014-09-27 0:57 ` Felipe Balbi [this message]
2014-09-27 15:15 ` Masahiro YAMADA
2014-09-27 11:36 ` Tom Rini
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=20140927005703.GC25432@saruman \
--to=balbi@ti.com \
--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