Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "Assorted tiny fixes queued in trivial tree" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits) DocBook: update EXPORT_SYMBOL entry to point at export.h Documentation: update top level 00-INDEX file with new additions ARM: at91/ide: remove unsused at91-ide Kconfig entry percpu_counter.h: comment code for better readability x86, efi: fix comment typo in head_32.S IB: cxgb3: delay freeing mem untill entirely done with it net: mvneta: remove unneeded version.h include time: x86: report_lost_ticks doesn't exist any more pcmcia: avoid static analysis complaint about use-after-free fs/jfs: Fix typo in comment : 'how may' -> 'how many' of: add missing documentation for of_platform_populate() btrfs: remove unnecessary cur_trans set before goto loop in join_transaction sound: soc: Fix typo in sound/codecs treewide: Fix typo in various drivers btrfs: fix comment typos Update ibmvscsi module name in Kconfig. powerpc: fix typo (utilties -> utilities) of: fix spelling mistake in comment h8300: Fix home page URL in h8300/README xtensa: Fix home page URL in Kconfig ...
此提交包含在:
@@ -8843,7 +8843,7 @@ static void bnx2x_set_234_gates(struct bnx2x *bp, bool close)
|
||||
(!close) ? (val | HC_CONFIG_0_REG_BLOCK_DISABLE_0) :
|
||||
(val & ~(u32)HC_CONFIG_0_REG_BLOCK_DISABLE_0));
|
||||
} else {
|
||||
/* Prevent incomming interrupts in IGU */
|
||||
/* Prevent incoming interrupts in IGU */
|
||||
val = REG_RD(bp, IGU_REG_BLOCK_CONFIGURATION);
|
||||
|
||||
REG_WR(bp, IGU_REG_BLOCK_CONFIGURATION,
|
||||
|
@@ -12,7 +12,6 @@
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/version.h>
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/etherdevice.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
@@ -64,7 +64,7 @@ static const char mlx4_en_version[] =
|
||||
|
||||
/* Enable RSS UDP traffic */
|
||||
MLX4_EN_PARM_INT(udp_rss, 1,
|
||||
"Enable RSS for incomming UDP traffic or disabled (0)");
|
||||
"Enable RSS for incoming UDP traffic or disabled (0)");
|
||||
|
||||
/* Priority pausing */
|
||||
MLX4_EN_PARM_INT(pfctx, 0, "Priority based Flow Control policy on TX[7:0]."
|
||||
|
@@ -1150,7 +1150,7 @@ static int qlcnic_check_npar_opertional(struct qlcnic_adapter *adapter)
|
||||
}
|
||||
if (!npar_opt_timeo) {
|
||||
dev_err(&adapter->pdev->dev,
|
||||
"Waiting for NPAR state to opertional timeout\n");
|
||||
"Waiting for NPAR state to operational timeout\n");
|
||||
return -EIO;
|
||||
}
|
||||
return 0;
|
||||
|
新增問題並參考
封鎖使用者