netdev - Re: [PATCH V2 net-next 0/6] mlxfw: Improve error reporting

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20191123164838.2df4c87f@cakuba.netronome.com>
Date:   Sat, 23 Nov 2019 16:48:38 -0800
From:   Jakub Kicinski <jakub.kicinski@...ronome.com>
To:     Saeed Mahameed <saeedm@...lanox.com>
Cc:     "David S. Miller" <davem@...emloft.net>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        Jiri Pirko <jiri@...lanox.com>
Subject: Re: [PATCH V2 net-next 0/6] mlxfw: Improve error reporting

On Fri, 22 Nov 2019 22:41:45 +0000, Saeed Mahameed wrote:
> merge conflict with net:
> @ drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c
> 
> ++<<<<<<< (net-next) (keep)
> +
> +       if (fsm_state_err != MLXFW_FSM_STATE_ERR_OK)
> +               return mlxfw_fsm_state_err(mlxfw_dev, extack, fsm_state_err);
> +
> ++=======  
> + 
> +       if (fsm_state_err != MLXFW_FSM_STATE_ERR_OK) {
> +               fsm_state_err = min_t(enum mlxfw_fsm_state_err,
> +                                     fsm_state_err, MLXFW_FSM_STATE_ERR_MAX);
> +               pr_err("Firmware flash failed: %s\n",
> +                      mlxfw_fsm_state_err_str[fsm_state_err]);
> +               NL_SET_ERR_MSG_MOD(extack, "Firmware flash failed");
> +               return -EINVAL;
> ++>>>>>>> (net) (delete)   
> 
> To resolve just use the 1st hunk, from net-next.

Net has been merged into -next, please rebase and repost, this doesn't
apply right now.