The patch titled
Subject: a
has been added to the -mm tree. Its filename is
linux-next-build-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-build-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-build-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: a
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/8390/8390.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/ethernet/8390/8390.h~linux-next-build-fix
+++ a/drivers/net/ethernet/8390/8390.h
@@ -50,7 +50,7 @@ void NS8390p_init(struct net_device *dev
int eip_open(struct net_device *dev);
int eip_close(struct net_device *dev);
irqreturn_t eip_interrupt(int irq, void *dev_id);
-void eip_tx_timeout(struct net_device *dev);
+void eip_tx_timeout(struct net_device *dev, unsigned int txqueue);
netdev_tx_t eip_start_xmit(struct sk_buff *skb, struct net_device *dev);
void eip_set_multicast_list(struct net_device *dev);
struct net_device_stats *eip_get_stats(struct net_device *dev);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-add-apply_to_existing_pages-helper-fix.patch
mm-add-apply_to_existing_pages-helper-fix-fix.patch
kasan-use-apply_to_existing_pages-for-releasing-vmalloc-shadow-fix.patch
lib-kconfigdebug-fix-some-messed-up-configurations-checkpatch-fixes.patch
mm.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
linux-next-build-fix.patch
drivers-block-null_blk_mainc-fix-layout.patch
drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
