| Message ID | 20241011121014.674661a0@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | linux-next: manual merge of the wireless-next tree with the net-next tree | expand |
diff --cc Documentation/networking/net_cachelines/net_device.rst index 1b018ac35e9a,efea96862a76..000000000000 --- a/Documentation/networking/net_cachelines/net_device.rst
Hi all, Today's linux-next merge of the wireless-next tree got a conflict in: Documentation/networking/net_cachelines/net_device.rst between commit: 54b771e6c675 ("doc: net: Fix .rst rendering of net_cachelines pages") from the net-next tree and commit: 836265d31631 ("wifi: remove iw_public_data from struct net_device") from the wireless-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.