[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20140215173754.GC8056@kroah.com>
Date: Sat, 15 Feb 2014 09:37:54 -0800
From: Greg KH <gregkh@...uxfoundation.org>
To: "Winkler, Tomas" <tomas.winkler@...el.com>
Cc: "arnd@...db.de" <arnd@...db.de>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [char-misc-next 3/4] mei: add mei_hbuf_acquire wrapper
On Sat, Feb 15, 2014 at 07:46:49AM +0000, Winkler, Tomas wrote:
> >
> > This patch fails to apply:
> > checking file drivers/misc/mei/amthif.c
> > checking file drivers/misc/mei/client.c
> > Hunk #4 FAILED at 681.
> > Hunk #5 succeeded at 815 (offset -2 lines).
> > Hunk #6 succeeded at 848 (offset -2 lines).
> > 1 out of 6 hunks FAILED
> > checking file drivers/misc/mei/hw-me.c
> > checking file drivers/misc/mei/hw-txe.c
> > checking file drivers/misc/mei/interrupt.c
> > checking file drivers/misc/mei/mei_dev.h
> > checking file drivers/misc/mei/wd.c
>
> Did I missed something in the process?
> This patch series has dependency on path that was destined for stable https://lkml.org/lkml/2014/2/12/389
> as stated in 0/4 http://www.spinics.net/lists/kernel/msg1686728.html
> Quoting:
> "In order to avoid conflicts please apply after
> mei: set client's read_cb to NULL when flow control fails
> https://lkml.org/lkml/2014/2/12/389"
I never read 0/4 emails :)
Care to resend both of these patches, I'll queue them up when I merge
char-misc-linus into char-misc-next after the next -rc is out.
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists