public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: "Winkler, Tomas" <tomas.winkler@intel.com>
Cc: "arnd@arndb.de" <arnd@arndb.de>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [char-misc-next 3/4] mei: add mei_hbuf_acquire wrapper
Date: Sat, 15 Feb 2014 09:37:54 -0800	[thread overview]
Message-ID: <20140215173754.GC8056@kroah.com> (raw)
In-Reply-To: <5B8DA87D05A7694D9FA63FD143655C1B1AF721AA@HASMSX106.ger.corp.intel.com>

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

  reply	other threads:[~2014-02-15 17:35 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-12 19:41 [char-misc-next 0/4] mei: fix txe write issue Tomas Winkler
2014-02-12 19:41 ` [char-misc-next 1/4] mei: rename MEI_FOP_IOCTL to MEI_FOP_CONNECT Tomas Winkler
2014-02-12 19:41 ` [char-misc-next 2/4] mei: get rid of ext_msg Tomas Winkler
2014-02-12 19:41 ` [char-misc-next 3/4] mei: add mei_hbuf_acquire wrapper Tomas Winkler
2014-02-14 19:13   ` Greg KH
2014-02-15  7:46     ` Winkler, Tomas
2014-02-15 17:37       ` Greg KH [this message]
2014-02-12 19:41 ` [char-misc-next 4/4] mei: revamp writing slot counting Tomas Winkler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140215173754.GC8056@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=arnd@arndb.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tomas.winkler@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox