From: David Miller <davem@davemloft•net>
To: sfr@canb•auug.org.au
Cc: greg@kroah•com, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org, Ian.Campbell@citrix•com,
netdev@vger•kernel.org, mark.einon@gmail•com
Subject: Re: linux-next: manual merge of the staging tree with the net tree
Date: Thu, 06 Oct 2011 01:56:22 -0400 (EDT) [thread overview]
Message-ID: <20111006.015622.2047301950614681216.davem@davemloft.net> (raw)
In-Reply-To: <20111006160433.44de2a1374b6ec4efc97e04e@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 6 Oct 2011 16:04:33 +1100
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/et131x/et1310_tx.c between commit bf3f1a6081aa ("et131x:
> convert to SKB paged frag API") from the net tree and commit 10f00a49b048
> ("staging: et131x: Rename var name 'etdev' to 'adapter' throughout
> module") from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Yep, we saw this one coming too. I think you'll need to carry this one
until the merge window flushes out.
Thanks!
next prev parent reply other threads:[~2011-10-06 5:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-06 5:04 linux-next: manual merge of the staging tree with the net tree Stephen Rothwell
2011-10-06 5:56 ` David Miller [this message]
2011-10-06 6:16 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-10-13 5:43 Stephen Rothwell
2011-10-13 6:12 ` Greg KH
2011-10-13 9:08 ` Arend van Spriel
2011-10-06 4:58 Stephen Rothwell
2011-10-06 8:59 ` Arend van Spriel
2011-08-26 3:47 Stephen Rothwell
2011-08-26 4:33 ` Greg KH
2011-08-26 5:35 ` Larry Finger
2011-07-22 5:42 Stephen Rothwell
2011-07-07 5:44 Stephen Rothwell
2011-07-07 13:43 ` Greg KH
2011-07-07 5:28 Stephen Rothwell
2011-07-07 13:43 ` Greg KH
2009-09-04 7:32 Stephen Rothwell
2009-09-04 14:52 ` Greg KH
2009-07-29 6:52 Stephen Rothwell
2009-07-29 12:44 ` Greg KH
2009-07-29 13:46 ` David Miller
2009-07-29 14:17 ` Greg KH
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=20111006.015622.2047301950614681216.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=Ian.Campbell@citrix$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mark.einon@gmail$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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