* Jakub Kicinski ([email protected]) wrote: > On Sat, 4 Jan 2025 21:56:24 +0000 Dr. David Alan Gilbert wrote: > > > This one doesn't apply, reportedly. > > > > Hmm, do you have a link to that report, or to which tree I should try > > applying it to. > > net-next, the tree in the subject prefix: > > $ git checkout net-next/main
Thanks > $ wget > 'https://lore.kernel.org/all/[email protected]/raw' > Saving 'raw' > $ git am raw > Applying: ixgbevf: Remove unused ixgbevf_hv_mbx_ops > error: patch failed: drivers/net/ethernet/intel/ixgbevf/ixgbevf.h:439 > error: drivers/net/ethernet/intel/ixgbevf/ixgbevf.h: patch does not apply > Patch failed at 0001 ixgbevf: Remove unused ixgbevf_hv_mbx_ops Oh I see, it's the e610 patch that crept in and just changed the context and moved the lines down a bit; not built it yet, but I'll cut a new version. See below. Dave diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h index 9b37f354d78c..4384e892f967 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h @@ -443,7 +443,6 @@ extern const struct ixgbevf_info ixgbevf_X540_vf_hv_info; extern const struct ixgbevf_info ixgbevf_X550_vf_hv_info; extern const struct ixgbevf_info ixgbevf_X550EM_x_vf_hv_info; extern const struct ixgbevf_info ixgbevf_e610_vf_hv_info; -extern const struct ixgbe_mbx_operations ixgbevf_hv_mbx_ops; /* needed by ethtool.c */ extern const char ixgbevf_driver_name[]; vs diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h index 130cb868774c..a43cb500274e 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h @@ -439,7 +439,6 @@ extern const struct ixgbevf_info ixgbevf_82599_vf_hv_info; extern const struct ixgbevf_info ixgbevf_X540_vf_hv_info; extern const struct ixgbevf_info ixgbevf_X550_vf_hv_info; extern const struct ixgbevf_info ixgbevf_X550EM_x_vf_hv_info; -extern const struct ixgbe_mbx_operations ixgbevf_hv_mbx_ops; /* needed by ethtool.c */ extern const char ixgbevf_driver_name[]; -- -----Open up your eyes, open up your mind, open up your code ------- / Dr. David Alan Gilbert | Running GNU/Linux | Happy \ \ dave @ treblig.org | | In Hex / \ _________________________|_____ http://www.treblig.org |_______/
