* linux-next: manual merge of the net tree with the tree
@ 2010-10-12 0:17 Stephen Rothwell
2010-10-12 3:51 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2010-10-12 0:17 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Stefan Richter, linux1394-devel,
Ben Hutchings
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
Hi all,
Today's linux-next merge of the net tree got a conflict in
drivers/ieee1394/eth1394.c between commit
66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
1394 driver stack") from the tree and commit
01414802054c382072b6cb9a1bdc6e243c74b2d5 ("ethtool: Provide a default
implementation of ethtool_ops::get_drvinfo") from the net tree.
The former removes the file. I just did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the net tree with the tree
2010-10-12 0:17 linux-next: manual merge of the net tree with the tree Stephen Rothwell
@ 2010-10-12 3:51 ` Stephen Rothwell
2010-10-12 5:56 ` Stefan Richter
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2010-10-12 3:51 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Stefan Richter, linux1394-devel,
Ben Hutchings
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
Hi all,
On Tue, 12 Oct 2010 11:17:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/ieee1394/eth1394.c between commit
> 66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
> 1394 driver stack") from the tree and commit
^
I meant to say "the ieee1394 tree".
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the net tree with the tree
2010-10-12 3:51 ` Stephen Rothwell
@ 2010-10-12 5:56 ` Stefan Richter
0 siblings, 0 replies; 6+ messages in thread
From: Stefan Richter @ 2010-10-12 5:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: netdev, linux-kernel, linux-next, Ben Hutchings, linux1394-devel,
David Miller
Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 12 Oct 2010 11:17:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Today's linux-next merge of the net tree got a conflict in
>> drivers/ieee1394/eth1394.c between commit
>> 66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
>> 1394 driver stack") from the tree and commit
> ^
> I meant to say "the ieee1394 tree".
(I should have put the ieee1394 removal into -next much earlier. OTOH the
conflicting commit is from August 17 already...)
Would it be useful if I rebase this small ieee1394 removal branch of mine onto
net?
--
Stefan Richter
-=====-==-=- =-=- -==--
http://arcgraph.de/sr/
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the net tree with the tree
@ 2011-01-04 2:28 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2011-01-04 2:28 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Jon Mason, Jesse Barnes,
Rafael J. Wysocki
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
Hi all,
Today's linux-next merge of the net tree got a conflict in
drivers/net/sky2.c between
commit1d3c16a818e992c199844954d95c17fd7ce6cbba ("PCI: make
pci_restore_state return void") from the tree and commit
0f333d10e3f689640b229c8cf00b16ea51ce4951 ("sky2: Do not use legacy PCI
power management") from the net tree.
The latter removes the code that the former modifies. I used the latter.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* linux-next: manual merge of the net tree with the tree
@ 2011-08-22 1:51 Stephen Rothwell
2011-08-23 18:10 ` Niklaus Giger
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-08-22 1:51 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Josh Boyer, Niklaus Giger, Tony Breeds
[-- Attachment #1: Type: text/plain, Size: 455 bytes --]
Hi all,
Today's linux-next merge of the net tree got a conflict in
arch/powerpc/configs/40x/hcu4_defconfig between commit 9fcd768d0cc8
("powerpc/40x: Remove obsolete HCU4 board") from the 4xx tree and commit
3b3bceef26f8 ("net: fix IBM EMAC driver after rename") from the net tree.
The former commit removes the file, so I just did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the net tree with the tree
2011-08-22 1:51 Stephen Rothwell
@ 2011-08-23 18:10 ` Niklaus Giger
0 siblings, 0 replies; 6+ messages in thread
From: Niklaus Giger @ 2011-08-23 18:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, netdev, linux-next, linux-kernel, Josh Boyer,
Tony Breeds
> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in
> arch/powerpc/configs/40x/hcu4_defconfig between commit 9fcd768d0cc8
> ("powerpc/40x: Remove obsolete HCU4 board") from the 4xx tree and commit
> 3b3bceef26f8 ("net: fix IBM EMAC driver after rename") from the net tree.
>
> The former commit removes the file, so I just did that.
Thanks!
Best regards
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-08-23 18:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-12 0:17 linux-next: manual merge of the net tree with the tree Stephen Rothwell
2010-10-12 3:51 ` Stephen Rothwell
2010-10-12 5:56 ` Stefan Richter
-- strict thread matches above, loose matches on Subject: below --
2011-01-04 2:28 Stephen Rothwell
2011-08-22 1:51 Stephen Rothwell
2011-08-23 18:10 ` Niklaus Giger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox