From: James Morris <james.l.morris@oracle.com>
Date: Wed, 19 Nov 2014 10:32:12 +0000 (+1100)
Subject: Merge commit 'v3.17' into next
X-Git-Tag: MMI-PSA29.97-13-9~10982^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b10778a00d40b3d9fdaaf5891e802794781ff71c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge commit 'v3.17' into next
---

b10778a00d40b3d9fdaaf5891e802794781ff71c
diff --cc include/linux/kernel.h
index 89a0b8e5a952,95624bed87ef..7c0ad8e38510
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@@ -493,16 -494,10 +494,11 @@@ static inline char *hex_byte_pack_upper
  	return buf;
  }
  
- static inline char * __deprecated pack_hex_byte(char *buf, u8 byte)
- {
- 	return hex_byte_pack(buf, byte);
- }
- 
  extern int hex_to_bin(char ch);
  extern int __must_check hex2bin(u8 *dst, const char *src, size_t count);
 +extern char *bin2hex(char *dst, const void *src, size_t count);
  
- int mac_pton(const char *s, u8 *mac);
+ bool mac_pton(const char *s, u8 *mac);
  
  /*
   * General tracing related utility functions - trace_printk(),