Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
We got slightly different patches removing a double word
in a comment in net/ipv4/raw.c - picked the version from net.
Simple conflict in drivers/net/ethernet/ibm/ibmvnic.c. Use cached
values instead of VNIC login response buffer (following what
commit 507ebe6444
("ibmvnic: Fix use-after-free of VNIC login
response buffer") did).
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
@ -1071,7 +1071,7 @@ static void qeth_issue_next_read_cb(struct qeth_card *card,
|
||||
break;
|
||||
case -EIO:
|
||||
qeth_schedule_recovery(card);
|
||||
/* fall through */
|
||||
fallthrough;
|
||||
default:
|
||||
qeth_clear_ipacmd_list(card);
|
||||
goto err_idx;
|
||||
@ -2887,7 +2887,7 @@ void qeth_print_status_message(struct qeth_card *card)
|
||||
card->info.mcl_level[3]);
|
||||
break;
|
||||
}
|
||||
/* fallthrough */
|
||||
fallthrough;
|
||||
case QETH_CARD_TYPE_IQD:
|
||||
if (IS_VM_NIC(card) || (card->info.mcl_level[0] & 0x80)) {
|
||||
card->info.mcl_level[0] = (char) _ebcasc[(__u8)
|
||||
|
Reference in New Issue
Block a user