From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, benh@kernel.crashing.org,
paulus@samba.org, linuxppc-dev@lists.ozlabs.org, joe@perches.com
Subject: Re: linux-next: manual merge of the net-next tree with the powerpc tree
Date: Sun, 11 Mar 2012 15:56:21 -0700 (PDT) [thread overview]
Message-ID: <20120311.155621.699600599796181447.davem@davemloft.net> (raw)
In-Reply-To: <20120309174416.2b936c5a4a116d56f9a25502@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 9 Mar 2012 17:44:16 +1100
> On Thu, 08 Mar 2012 22:15:34 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Fri, 9 Mar 2012 13:36:46 +1100
>>
>> > Today's linux-next merge of the net-next tree got a conflict in
>> > drivers/net/ethernet/ibm/iseries_veth.c between commit e92a665949f6
>> > ("net: powerpc: remove the legacy iSeries ethernet driver") from the
>> > powerpc tree and commit 41de8d4cff21 ("drivers/net: Remove alloc_etherdev
>> > error messages") from the net-next tree.
>> >
>> > I just removed the file.
>>
>> If it makes life easier for anyone I can put the driver removal patch
>> into net-next.
>
> In this case, I think it will actually help, thanks. Note that it won;t
> apply cleanly to your tree, but the fixup is easy :-)
>
> And I discovered that "git am" doesn't like the style of patch I did
> (without the body of the deleted file). If you just delete
> drivers/net/ethernet/ibm/iseries_veth.c before trying to apply the patch
> it will probably work.
I took care of this the other night.
next prev parent reply other threads:[~2012-03-11 22:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-09 2:36 linux-next: manual merge of the net-next tree with the powerpc tree Stephen Rothwell
2012-03-09 6:15 ` David Miller
2012-03-09 6:44 ` Stephen Rothwell
2012-03-11 22:56 ` David Miller [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-05 23:21 Stephen Rothwell
2020-04-01 23:09 ` Stephen Rothwell
2023-08-18 1:17 Stephen Rothwell
2023-08-29 23:28 ` Stephen Rothwell
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=20120311.155621.699600599796181447.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=benh@kernel.crashing.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=netdev@vger.kernel.org \
--cc=paulus@samba.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox