From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sat, 22 Jan 2022 16:19:22 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nBIAk-009xrj-IH for lore@lore.pengutronix.de; Sat, 22 Jan 2022 16:19:22 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nBIAj-0003ww-J9; Sat, 22 Jan 2022 16:19:21 +0100 Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nBIAb-0003wh-Fy; Sat, 22 Jan 2022 16:19:13 +0100 Received: from rsc by pty.hi.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nBIAb-0067rn-0b; Sat, 22 Jan 2022 16:19:13 +0100 Date: Sat, 22 Jan 2022 16:19:12 +0100 From: Robert Schwebel To: Ahmad Fatoum Message-ID: References: <20220118105636.2227695-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 16:19:02 up 156 days, 7:52, 23 users, load average: 0,07, 0,06, 0,02 Subject: Re: [DistroKit] =?utf-8?q?=5BPATCH=5D_v7a=3A_barebox=3A_update_v2021?= =?utf-8?b?LjExLjAg4oaSIHYyMDIyLjAxLjA=?= X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: distrokit@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false On Sat, Jan 22, 2022 at 11:52:09AM +0100, Robert Schwebel wrote: > On Tue, Jan 18, 2022 at 03:32:20PM +0100, Ahmad Fatoum wrote: > > > Could you rebase against master? I forgot to merge next into master > > > recently, so there were some patches. > > > > I fetched and my master HEAD commit is > > 5e3d0b4ebd31 ("doc: document patch download with b4 from lore.distrokit.org") > > > > And this patch cleanly applies there: > > b4 am -o- '' | git am > > > > Should I rebase onto something else? > > Hmm, I must have mixed something up yesterday, it works now. Testing... Merged. 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