From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dan Williams <dan.j.williams@intel•com>
Cc: linux-next@vger•kernel.org, David Miller <davem@davemloft•net>,
"Eric W. Biederman" <ebiederm@xmission•com>
Subject: Re: linux-next: net tree build failure
Date: Mon, 29 Dec 2008 17:45:47 +1100 [thread overview]
Message-ID: <20081229174547.e0434a8a.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20081120133036.3a4aea4a.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1533 bytes --]
Hi Dan,
On Thu, 20 Nov 2008 13:30:36 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> net/core/dev.c: In function 'net_dev_init':
> net/core/dev.c:4775: error: implicit declaration of function 'netdev_dma_register'
>
> A bad interaction between commit 505d4f73dda9e20d59da05008f1f5eb432613e71
> "net: Guaranetee the proper ordering of the loopback device. v2" from the
> net tree (which moved a call to netdev_dma_register) and commit
> 8f3da0d613494b02f8628bb5dbf2366f0298505c "dmaengine: kill struct
> dma_client and supporting infrastructure" from the async_tx tree (which
> removes the call).
>
> I added the below patch to fix up the merge and can carry it.
This now occurs when I merge the async_tx tree as the net tree has been
merged into Linus' tree. You should fix this (by merging Linus' tree
into yours and doing the fixup below as part of the merge commit) before
asking Linus to pull your tree.
> diff --git a/net/core/dev.c b/net/core/dev.c
> index c3f5713..e9cf36e 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -4772,8 +4772,6 @@ static int __init net_dev_init(void)
> if (register_pernet_device(&default_device_ops))
> goto out;
>
> - netdev_dma_register();
> -
> open_softirq(NET_TX_SOFTIRQ, net_tx_action);
> open_softirq(NET_RX_SOFTIRQ, net_rx_action);
>
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-12-29 6:46 UTC|newest]
Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-20 2:30 linux-next: net tree build failure Stephen Rothwell
2008-12-29 6:45 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-01-27 2:18 Stephen Rothwell
2010-01-27 4:49 ` David Miller
2010-01-11 7:42 Stephen Rothwell
2010-01-11 8:02 ` David Miller
2010-01-11 8:16 ` Joe Perches
2010-01-11 8:44 ` David Miller
2010-01-11 8:49 ` Stephen Rothwell
2010-01-11 11:16 ` Maciej W. Rozycki
2009-11-18 5:51 Stephen Rothwell
2009-11-18 7:05 ` David Miller
2009-11-19 10:51 ` Shreyas Bhatewara
2009-11-14 6:50 Stephen Rothwell
2009-11-14 13:18 ` Arnaldo Carvalho de Melo
2009-11-09 2:21 Stephen Rothwell
2009-11-09 4:41 ` David Miller
2009-10-13 4:33 Stephen Rothwell
2009-10-13 5:14 ` Michael Chan
2009-10-13 6:20 ` David Miller
2009-10-13 6:19 ` David Miller
2009-06-17 6:31 Stephen Rothwell
2009-06-17 8:36 ` David Miller
2009-06-17 13:10 ` Stephen Rothwell
[not found] <20090521001928.4bf71911.sfr@canb.auug.org.au>
2009-05-20 14:53 ` Eric W. Biederman
2009-05-20 19:44 ` David Miller
2009-04-24 7:01 Stephen Rothwell
2009-04-24 11:53 ` David Miller
2009-04-24 11:57 ` Stephen Rothwell
2009-04-22 0:29 Stephen Rothwell
2009-04-22 0:37 ` Alexander Beregalov
2009-04-22 1:12 ` David Miller
2009-04-20 1:26 Stephen Rothwell
2009-04-20 1:36 ` Alexander Beregalov
2009-04-20 1:43 ` David Miller
2009-04-20 1:50 ` Stephen Rothwell
2009-03-19 4:46 Stephen Rothwell
2009-03-19 5:40 ` David Miller
2009-04-01 19:58 ` Ingo Molnar
2009-04-01 21:22 ` David Miller
2009-03-30 1:15 ` Stephen Rothwell
2009-03-30 1:50 ` Stephen Rothwell
2009-03-02 7:05 Stephen Rothwell
2009-03-02 9:49 ` David Miller
2009-03-02 16:38 ` Andy Grover
2009-03-03 1:55 ` Stephen Rothwell
2009-03-03 3:22 ` Andy Grover
2009-01-26 2:53 Stephen Rothwell
2009-01-26 4:46 ` David Miller
2009-01-26 5:15 ` Stephen Rothwell
2009-01-26 5:17 ` David Miller
2009-01-26 8:31 ` Stephen Rothwell
2009-01-26 19:40 ` David Miller
2009-01-23 7:28 Stephen Rothwell
2009-01-23 7:56 ` David Miller
2009-01-23 8:01 ` Stephen Rothwell
2009-01-23 8:13 ` David Miller
2009-01-23 10:21 ` Stephen Rothwell
2009-01-23 10:39 ` Stephen Rothwell
2009-01-23 10:50 ` Stephen Rothwell
2009-01-24 6:27 ` David Miller
2008-12-09 6:29 Stephen Rothwell
2008-12-09 8:04 ` David Miller
2008-12-09 8:54 ` Stephen Rothwell
2008-12-09 9:05 ` David Miller
2008-12-09 9:12 ` Marcel Holtmann
2008-11-28 3:46 Stephen Rothwell
2008-11-28 7:07 ` David Miller
2008-11-26 7:15 Stephen Rothwell
2008-11-26 7:51 ` Herbert Xu
2008-11-26 8:45 ` David Miller
2008-11-26 9:40 ` Stephen Rothwell
2008-11-24 2:43 Stephen Rothwell
2008-11-24 3:56 ` David Miller
2008-11-24 4:03 ` David Miller
2008-11-24 4:25 ` Stephen Rothwell
2008-11-24 4:28 ` David Miller
2008-11-24 4:49 ` Stephen Rothwell
2008-11-24 5:04 ` David Miller
2008-11-24 5:20 ` Stephen Rothwell
2008-11-24 5:22 ` Stephen Rothwell
2008-11-24 5:23 ` David Miller
2008-11-24 5:29 ` David Miller
2008-11-24 5:45 ` Stephen Rothwell
2008-11-24 5:38 ` Stephen Rothwell
2008-11-24 21:00 ` Sam Ravnborg
2008-11-24 21:52 ` Stephen Hemminger
2008-11-24 22:12 ` Sam Ravnborg
2008-11-25 8:42 ` Stephen Rothwell
2008-11-25 9:01 ` Sam Ravnborg
2008-11-21 2:44 Stephen Rothwell
2008-11-21 4:02 ` Stephen Hemminger
2008-11-21 4:13 ` David Miller
2008-11-20 2:58 Stephen Rothwell
2008-09-13 5:03 Stephen Rothwell
2008-09-13 6:24 ` David Miller
2008-09-13 9:42 ` Stephen Rothwell
2008-09-15 0:54 ` Simon Horman
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=20081229174547.e0434a8a.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dan.j.williams@intel$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=ebiederm@xmission$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
/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