Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: build failure after merge of the vhost tree
Date: Wed, 4 Dec 2019 14:24:04 +1100
Message-ID: <20191204142404.56631d84@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2271 bytes --]

Hi all,

After merging the vhost tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/net/ethernet/atheros/atlx/atl1.c:2889:21: error: initialization of 'void (*)(struct net_device *, unsigned int)' from incompatible pointer type 'void (*)(struct net_device *)' [-Werror=incompatible-pointer-types]
 2889 |  .ndo_tx_timeout  = atlx_tx_timeout,
      |                     ^~~~~~~~~~~~~~~
drivers/net/ethernet/atheros/atlx/atl1.c:2889:21: note: (near initialization for 'atl1_netdev_ops.ndo_tx_timeout')

Caused by commit

  29fd1db09264 ("netdev: pass the stuck queue to the timeout handler")

I applied the following patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 4 Dec 2019 14:13:18 +1100
Subject: [PATCH] netdev: another fix for "netdev: pass the stuck queue to the
 timeout handler"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/atheros/atlx/atlx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/atheros/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c
index 505a22c703f7..0941d07d0833 100644
--- a/drivers/net/ethernet/atheros/atlx/atlx.c
+++ b/drivers/net/ethernet/atheros/atlx/atlx.c
@@ -183,7 +183,7 @@ static void atlx_clear_phy_int(struct atlx_adapter *adapter)
  * atlx_tx_timeout - Respond to a Tx Hang
  * @netdev: network interface device structure
  */
-static void atlx_tx_timeout(struct net_device *netdev)
+static void atlx_tx_timeout(struct net_device *netdev, unsigned int txqueue)
 {
 	struct atlx_adapter *adapter = netdev_priv(netdev);
 	/* Do the reset outside of interrupt context */
-- 
2.24.0

Then I got another build failure:

drivers/net/ethernet/natsemi/ns83820.c: In function 'ns83820_tx_watch':
drivers/net/ethernet/natsemi/ns83820.c:1606:3: error: too few arguments to function 'ns83820_tx_timeout'
 1606 |   ns83820_tx_timeout(ndev);
      |   ^~~~~~~~~~~~~~~~~~
drivers/net/ethernet/natsemi/ns83820.c:1552:13: note: declared here
 1552 | static void ns83820_tx_timeout(struct net_device *ndev, unsigned int txqueue)
      |             ^~~~~~~~~~~~~~~~~~

At this point, I just used the vhost tree from next-20191203 ...
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply index

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-04  3:24 Stephen Rothwell [this message]
2019-12-07 23:45 ` Stephen Rothwell
2019-12-09 15:24 ` Michael S. Tsirkin
  -- strict thread matches above, loose matches on Subject: below --
2018-02-07  2:04 Stephen Rothwell
2018-02-07  2:52 ` Michael S. Tsirkin
2018-02-07  2:54 ` Stephen Rothwell
2018-02-07  2:57   ` Michael S. Tsirkin
2018-02-07  4:30     ` Stephen Rothwell
2017-03-30  4:25 Stephen Rothwell
2017-04-03  6:21 ` Stephen Rothwell
2014-06-10  4:12 Stephen Rothwell
2014-06-10  9:38 ` Michael S. Tsirkin
2014-06-03  8:38 Stephen Rothwell
2014-06-09 13:19 ` Michael S. Tsirkin
2013-05-22  4:37 Stephen Rothwell
2013-05-22  5:07 ` Michael S. Tsirkin
2013-05-22  9:03 ` Michael S. Tsirkin

Reply instructions:

You may reply publically 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=20191204142404.56631d84@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mst@redhat.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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git