Commit d4031ec8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Cross-merge networking fixes after downstream PR.

Conflicts:

net/ipv4/raw.c
  3632679d ("ipv{4,6}/raw: fix output xfrm lookup wrt protocol")
  c85be08f ("raw: Stop using RTO_ONLINK.")
https://lore.kernel.org/all/20230525110037.2b532b83@canb.auug.org.au/



Adjacent changes:

drivers/net/ethernet/freescale/fec_main.c
  9025944f ("net: fec: add dma_wmb to ensure correct descriptor values")
  144470c8 ("net: fec: using the standard return codes when xdp xmit errors")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 657d42cf ad42a35b

Documentation/process/maintainer-netdev.rst

+26 −7
Original line number Diff line number Diff line
@@ -127,13 +127,32 @@ the value of ``Message-ID`` to the URL above. 
Updating patch status

~~~~~~~~~~~~~~~~~~~~~



It may be tempting to help the maintainers and update the state of your

own patches when you post a new version or spot a bug. Please **do not**

do that.

Interfering with the patch status on patchwork will only cause confusion. Leave

it to the maintainer to figure out what is the most recent and current

version that should be applied. If there is any doubt, the maintainer

will reply and ask what should be done.

Contributors and reviewers do not have the permissions to update patch

state directly in patchwork. Patchwork doesn't expose much information

about the history of the state of patches, therefore having multiple

people update the state leads to confusion.



Instead of delegating patchwork permissions netdev uses a simple mail

bot which looks for special commands/lines within the emails sent to

the mailing list. For example to mark a series as Changes Requested

one needs to send the following line anywhere in the email thread::



  pw-bot: changes-requested



As a result the bot will set the entire series to Changes Requested.

This may be useful when author discovers a bug in their own series

and wants to prevent it from getting applied.



The use of the bot is entirely optional, if in doubt ignore its existence

completely. Maintainers will classify and update the state of the patches

themselves. No email should ever be sent to the list with the main purpose

of communicating with the bot, the bot commands should be seen as metadata.



The use of the bot is restricted to authors of the patches (the ``From:``

header on patch submission and command must match!), maintainers themselves

and a handful of senior reviewers. Bot records its activity here:



  https://patchwork.hopto.org/pw-bot.html



Review timelines

~~~~~~~~~~~~~~~~

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -8165,6 +8165,7 @@ F: include/linux/spi/spi-fsl-dspi.h 








FREESCALE ENETC ETHERNET DRIVERS









M:	Claudiu Manoil <claudiu.manoil@nxp.com>









M:	Vladimir Oltean <vladimir.oltean@nxp.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/ethernet/freescale/enetc/
































drivers/bluetooth/btnxpuart.c



+3
−3






























Original line number
Diff line number
Diff line







@@ -1319,17 +1319,17 @@ static void nxp_serdev_remove(struct serdev_device *serdev)







	hci_free_dev(hdev);









}



















static struct btnxpuart_data w8987_data = {









static struct btnxpuart_data w8987_data __maybe_unused = {









	.helper_fw_name = NULL,









	.fw_name = FIRMWARE_W8987,









};



















static struct btnxpuart_data w8997_data = {









static struct btnxpuart_data w8997_data __maybe_unused = {









	.helper_fw_name = FIRMWARE_HELPER,









	.fw_name = FIRMWARE_W8997,









};



















static const struct of_device_id nxpuart_of_match_table[] = {









static const struct of_device_id nxpuart_of_match_table[] __maybe_unused = {









	{ .compatible = "nxp,88w8987-bt", .data = &w8987_data },









	{ .compatible = "nxp,88w8997-bt", .data = &w8997_data },









	{ }
































drivers/net/bonding/bond_main.c



+7
−1






























Original line number
Diff line number
Diff line







@@ -3950,7 +3950,11 @@ static int bond_slave_netdev_event(unsigned long event,







		unblock_netpoll_tx();









		break;









	case NETDEV_FEAT_CHANGE:









		if (!bond->notifier_ctx) {









			bond->notifier_ctx = true;









			bond_compute_features(bond);









			bond->notifier_ctx = false;









		}









		break;









	case NETDEV_RESEND_IGMP:









		/* Propagate to master device */








@@ -6345,6 +6349,8 @@ static int bond_init(struct net_device *bond_dev)







	if (!bond->wq)









		return -ENOMEM;



















	bond->notifier_ctx = false;



















	spin_lock_init(&bond->stats_lock);









	netdev_lockdep_set_classes(bond_dev);










































drivers/net/ethernet/3com/3c589_cs.c



+10
−1






























Original line number
Diff line number
Diff line







@@ -195,6 +195,7 @@ static int tc589_probe(struct pcmcia_device *link)







{









	struct el3_private *lp;









	struct net_device *dev;









	int ret;



















	dev_dbg(&link->dev, "3c589_attach()\n");


















@@ -218,7 +219,15 @@ static int tc589_probe(struct pcmcia_device *link)

















	dev->ethtool_ops = &netdev_ethtool_ops;



















	return tc589_config(link);









	ret = tc589_config(link);









	if (ret)









		goto err_free_netdev;



















	return 0;



















err_free_netdev:









	free_netdev(dev);









	return ret;









}



















static void tc589_detach(struct pcmcia_device *link)