On Wed, Mar 18, 2026 at 07:36:14PM -0700, Jakub Kicinski wrote: > On Mon, 16 Mar 2026 04:23:27 -0700 Erni Sri Satya Vennela wrote: > > Add debugfs entries to expose hardware configuration and diagnostic > > information that aids in debugging driver initialization and runtime > > operations without adding noise to dmesg. > > > > The debugfs directory creation and removal for each PCI device is > > integrated into mana_gd_setup() and mana_gd_cleanup_device() > > respectively, so that all callers (probe, remove, suspend, resume, > > shutdown) share a single code path. > > Does not apply: > > Failed to apply patch: > Applying: net: mana: Expose hardware diagnostic info via debugfs > Using index info to reconstruct a base tree... > M drivers/net/ethernet/microsoft/mana/gdma_main.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/net/ethernet/microsoft/mana/gdma_main.c > CONFLICT (content): Merge conflict in > drivers/net/ethernet/microsoft/mana/gdma_main.c > Recorded preimage for 'drivers/net/ethernet/microsoft/mana/gdma_main.c' > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch=diff' to see the failed patch > hint: When you have resolved this problem, run "git am --continue". > hint: If you prefer to skip this patch, run "git am --skip" instead. > hint: To restore the original branch and stop patching, run "git am --abort". > hint: Disable this message with "git config set advice.mergeConflict false" > Patch failed at 0001 net: mana: Expose hardware diagnostic info via debugfs > -- > pw-bot: cr
I will rebase and send the next version. Thankyou.
