From: Robert Schwebel <r.schwebel@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: distrokit@pengutronix.de
Subject: Re: [DistroKit] [PATCH] fixup! v7a: kernel: configure for MC-1
Date: Mon, 27 Apr 2020 09:40:27 +0200 [thread overview]
Message-ID: <20200427074027.hqhzt4xfm5uuhkpg@pengutronix.de> (raw)
In-Reply-To: <c1c8cbc7-8ca3-2c00-4325-df52756e0bf6@pengutronix.de>
On Mon, Apr 27, 2020 at 09:26:36AM +0200, Ahmad Fatoum wrote:
> > This does not apply; did you mean to patch the barebox patch instead
> > of the kernel patch?
>
> I wanted to migrate the kernel config changes from the barebox commit
> to the kernel one, where it belongs. Unfortunately, I can't prepare a
> patch applicable at the end as that would result in a conflict on
> squashing.
>
> Could you do an interactive rebase, choose to [e]dit the "v7a: kernel:
> configure for MC-1" commit and then apply this fixup?
Done.
rsc
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
next prev parent reply other threads:[~2020-04-27 7:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 17:17 [DistroKit] [PATCH 1/7] ptxdist: migrate 2020.03.0 -> 2020.04.0 with defaults Ahmad Fatoum
2020-04-24 17:17 ` [DistroKit] [PATCH 2/7] v7a: tf-a: version bump v2.2 -> v2.3 Ahmad Fatoum
2020-04-24 17:17 ` [DistroKit] [PATCH 3/7] v7a: tf-a: add support for Linux Automation MC-1 Ahmad Fatoum
2020-04-24 17:17 ` [DistroKit] [PATCH 4/7] v7a: kernel: configure for MC-1 Ahmad Fatoum
2020-04-24 17:17 ` [DistroKit] [PATCH 5/7] v7a: stm32mp: add Linux Automation MC-1 device tree Ahmad Fatoum
2020-04-24 17:17 ` [DistroKit] [PATCH 6/7] v7a: barebox: add support for Linux Automation MC-1 Ahmad Fatoum
2020-04-24 17:17 ` [DistroKit] [PATCH 7/7] v7a: generate image " Ahmad Fatoum
2020-04-26 7:47 ` [DistroKit] [PATCH 1/7] ptxdist: migrate 2020.03.0 -> 2020.04.0 with defaults Robert Schwebel
2020-04-26 22:20 ` Ahmad Fatoum
2020-04-26 22:27 ` [DistroKit] [PATCH] fixup! v7a: kernel: configure for MC-1 Ahmad Fatoum
2020-04-27 5:47 ` Robert Schwebel
2020-04-27 7:26 ` Ahmad Fatoum
2020-04-27 7:40 ` Robert Schwebel [this message]
2020-04-26 22:28 ` [DistroKit] [PATCH] fixup! v7a: barebox: add support for Linux Automation MC-1 Ahmad Fatoum
2020-04-27 5:46 ` Robert Schwebel
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=20200427074027.hqhzt4xfm5uuhkpg@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=a.fatoum@pengutronix.de \
--cc=distrokit@pengutronix.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