Merge commit 'v3.17' into next

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc fs/nfsd/vfs.c
Simple merge

diff --cc include/linux/kernel.h
index 89a0b8e,95624be..7c0ad8e
--- 1/include/linux/kernel.h
--- 2/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(),

diff --cc net/rxrpc/ar-key.c
Simple merge

diff --cc security/keys/key.c
Simple merge

diff --cc security/keys/request_key.c
Simple merge

diff --cc security/selinux/netif.c
Simple merge