== Series Details == Series: ice: make const read-only array dflt_rules static URL : https://patchwork.freedesktop.org/series/146396/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/146396/revisions/1/mbox/ not applied Applying: ice: make const read-only array dflt_rules static Using index info to reconstruct a base tree... M drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 ice: make const read-only array dflt_rules static When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Build failed, no error log produced
