From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Date: Mon, 27 Apr 2020 09:40:27 +0200 From: Robert Schwebel Message-ID: <20200427074027.hqhzt4xfm5uuhkpg@pengutronix.de> References: <20200426074752.kmmge3ma3gofzyey@pengutronix.de> <20200426222700.11036-1-a.fatoum@pengutronix.de> <20200427054712.t5nlifh5duhdqwsq@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Subject: Re: [DistroKit] [PATCH] fixup! v7a: kernel: configure for MC-1 List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: distrokit-bounces@pengutronix.de Sender: "DistroKit" To: Ahmad Fatoum Cc: distrokit@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