From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-lf0-x22f.google.com ([2a00:1450:4010:c07::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtVpy-0006Zv-Qn for barebox@lists.infradead.org; Tue, 03 Nov 2015 07:16:59 +0000 Received: by lfbf136 with SMTP id f136so7508940lfb.0 for ; Mon, 02 Nov 2015 23:16:36 -0800 (PST) Date: Tue, 3 Nov 2015 10:39:48 +0300 From: Antony Pavlov Message-Id: <20151103103948.d0d3ebcdddbb148da1efe81f@gmail.com> In-Reply-To: <20151103065158.GC25416@pengutronix.de> References: <20151103012055.1fd914dbb7d224a0c56fb0d4@gmail.com> <20151103065158.GC25416@pengutronix.de> Mime-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: some patches are missed in the next branch To: Sascha Hauer Cc: barebox@lists.infradead.org On Tue, 3 Nov 2015 07:51:58 +0100 Sascha Hauer wrote: > Hi Antony, > = > On Tue, Nov 03, 2015 at 01:20:55AM +0300, Antony Pavlov wrote: > > Hi! > > = > > These patches were added to the next branch last month: > > = > > ARM: mvebu: Lenovo IX4 300D: Fix pblb generation > > scripts/kwbimage: Make BINARY files relative to config file > > scripts/kwbimage: Move configfile opening to the function that reads = it > > usb: ehci-hcd: Use regular mdelay() > > Revert "usb: ehci-hcd: detect re-entrance" > > Revert "usb: ehci-hcd: use mdelay_non_interruptible()" > > usb: core: return -EAGAIN on usb_* functions reentrance > > input: usb_kbd: skip poll on -EAGAIN error > > net: mvneta: add Armada XP compatible > > clk: mvebu: Add corediv clock driver for Armada 370/XP > > = > > Now they have gone away! Why? I have just pushed missed commits on top of yesterday next branch to github. Please see https://github.com/frantony/barebox/tree/20151103.missed-patches > = > I remember that I accidently did some desastrous git command like git > reset --hard and haven't been on the branch I assumed I was on. I > thought I recovered that, but it seems I haven't. Do you by accident > have the patches in one of your branches? I cannot find them in my > repository. I just picked them from the mailing list, but I would prefer > to get the original patches again. > = > Sascha > = > -- = > Pengutronix e.K. | | > Industrial Linux Solutions | http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- = --=A0 Best regards, =A0 Antony Pavlov _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox