All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Wang Chen <wangchen@cn.fujitsu.com>,
	"David S. Miller" <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the staging tree
Date: Mon, 8 Dec 2008 07:17:50 -0800	[thread overview]
Message-ID: <20081208151750.GE19711@kroah.com> (raw)
In-Reply-To: <20081208203403.320ea0bb.sfr@canb.auug.org.au>

On Mon, Dec 08, 2008 at 08:34:03PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflicts in
> drivers/staging/wlan-ng/p80211netdev.c and
> drivers/staging/wlan-ng/p80211wext.c between commit
> 979123d5343b4fdcd4c682745b8a0be9b8fac248 ("staging-p80211: Kill directly
> reference of netdev->priv") from the net tree and various commits from
> the staging tree.
> 
> I fixed it up (see below) and can carry the fixes as necessary. (In the
> case of the second file, the latter removed the code that the former
> modified.)

Dave, can you just drop the patch from your queue?  This should already
be fixed up in the -next tree to not use the field you are wanting to
remove, right?  So you shouldn't get any build errors from what I can
tell.

thanks,

greg k-h

  reply	other threads:[~2008-12-08 15:27 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-08  9:34 linux-next: manual merge of the staging tree Stephen Rothwell
2008-12-08 15:17 ` Greg KH [this message]
2008-12-08 20:35   ` David Miller
2008-12-09  3:53     ` Greg KH
2008-12-09  7:59       ` David Miller
2008-12-09 15:40         ` Greg KH
2008-12-09 21:42           ` David Miller

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=20081208151750.GE19711@kroah.com \
    --to=greg@kroah.com \
    --cc=davem@davemloft.net \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=wangchen@cn.fujitsu.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 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.