From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 23 Apr 2010 00:08:44 +0000 (+0200)
Subject: Merge branch 'master' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'master' into for-next
---

6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1
diff --cc drivers/scsi/bfa/include/defs/bfa_defs_status.h
index 03ce0331eb48,4374494bd566..ec78b4cb121a
--- a/drivers/scsi/bfa/include/defs/bfa_defs_status.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_status.h
@@@ -223,13 -223,12 +223,12 @@@ enum bfa_status 
  	BFA_STATUS_IM_PVID_NON_ZERO = 140, /*  Port VLAN ID (PVID) is Set to
  					    * Non-Zero Value */
  	BFA_STATUS_IM_INETCFG_LOCK_FAILED = 141, /*  Acquiring Network
 -						  * Subsytem Lock Failed.Please
 +						  * Subsystem Lock Failed.Please
  						  * try after some time */
 -	BFA_STATUS_IM_GET_INETCFG_FAILED = 142, /*  Acquiring Network Subsytem
 +	BFA_STATUS_IM_GET_INETCFG_FAILED = 142, /*  Acquiring Network Subsystem
  						 * handle Failed. Please try
  						 * after some time */
- 	BFA_STATUS_IM_NOT_BOUND = 143, /*  Brocade 10G Ethernet Service is not
- 					* Enabled on this port */
+ 	BFA_STATUS_IM_NOT_BOUND = 143, /*  IM driver is not active */
  	BFA_STATUS_INSUFFICIENT_PERMS = 144, /*  User doesn't have sufficient
  					      * permissions to execute the BCU
  					      * application */
diff --cc fs/omfs/inode.c
index 2ff33ea5cb34,c82af6acc2e7..b44bb835e8ea
--- a/fs/omfs/inode.c
+++ b/fs/omfs/inode.c
@@@ -3,8 -3,10 +3,9 @@@
   * Copyright (C) 2006 Bob Copeland <me@bobcopeland.com>
   * Released under GPL v2.
   */
 -#include <linux/version.h>
  #include <linux/module.h>
  #include <linux/sched.h>
+ #include <linux/slab.h>
  #include <linux/fs.h>
  #include <linux/vfs.h>
  #include <linux/parser.h>