some patches are missed in the next branch

some patches are missed in the next branch

[Antony Pavlov]

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?

-- 
Best regards,
  Antony Pavlov

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: some patches are missed in the next branch

[Sascha Hauer]

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 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 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: some patches are missed in the next branch

[Antony Pavlov]

On Tue, 3 Nov 2015 07:51:58 +0100
Sascha Hauer <s.hauer@pengutronix.de> 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 |


-- 
-- 
Best regards,
  Antony Pavlov

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: some patches are missed in the next branch

[Sascha Hauer]

On Tue, Nov 03, 2015 at 10:39:48AM +0300, Antony Pavlov wrote:
> On Tue, 3 Nov 2015 07:51:58 +0100
> Sascha Hauer <s.hauer@pengutronix.de> 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

Ouch, everything fine. I just rebased this branch on my current next and
it turned out to be empty afterwards. The patches are still there and in
current next.

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 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox