linux-next: manual merge of the trivial tree with the net-next tree

Hi Jiri, Today's linux-next merge of the trivial tree got a conflict in drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c between commit 068a8d197e00 ("qlcnic: Replace poll mode mailbox interface with interrupt based mailbox interface") from the tree and commit 0b1587b18bfe ("treewide: Fix typo

linux-next: manual merge of the trivial tree with the net-next tree

Hi Jiri, Today's linux-next merge of the trivial tree got a conflict in Documentation/networking/netlink_mmap.txt between commit 3dd17edea018 ("doc:networking: Fix typo in documentation/networking") from the net-next tree and commit f884ab15afdc ("doc: fix misspellings with 'codespell' tool") from