All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: 20111025192636.f816c8860ee168a0a4756eda@canb.auug.org.au
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jiri Pirko <jpirko@redhat.com>,
	Ian Campbell <Ian.Campbell@citrix.com>,
	David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org, Mark Einon <mark.einon@gmail.com>
Subject: Re: [PATCH] linux-next: et131x: Fixups due to merge issues from staging tree
Date: Tue, 31 Jan 2012 10:26:09 -0800	[thread overview]
Message-ID: <20120131182609.GA12819@kroah.com> (raw)
In-Reply-To: <20111025121551.GA2108@marke.airties>

On Tue, Oct 25, 2011 at 01:15:52PM +0100, Mark Einon wrote:
> 
> Manually merged changes from commits afc4b13df143, bf3f1a6081aa and 5d6bcdfe38ce into et131x.c as identified in email below.
> 
> Also removed dependency on NETDEV_1000 in Kconfig, which no longer exists.
> 
> Greg: This patch should also be good for the staging tree.

I don't think this is needed anymore, right?

If so, please redo it against Linus's tree and send it to me.

thanks,

greg k-h

  reply	other threads:[~2012-01-31 18:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-25  8:26 linux-next: manual merge of the staging tree with the net-next tree Stephen Rothwell
2011-10-25  8:26 ` Stephen Rothwell
2011-10-25 12:15 ` [PATCH] linux-next: et131x: Fixups due to merge issues from staging tree Mark Einon
2012-01-31 18:26   ` Greg KH [this message]
2012-01-31 19:09     ` Mark Einon

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=20120131182609.GA12819@kroah.com \
    --to=greg@kroah.com \
    --cc=20111025192636.f816c8860ee168a0a4756eda@canb.auug.org.au \
    --cc=Ian.Campbell@citrix.com \
    --cc=davem@davemloft.net \
    --cc=jpirko@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mark.einon@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.