Merge commit 'v3.17' into next
authorJames Morris <james.l.morris@oracle.com>
Wed, 19 Nov 2014 10:32:12 +0000 (21:32 +1100)
committerJames Morris <james.l.morris@oracle.com>
Wed, 19 Nov 2014 10:32:12 +0000 (21:32 +1100)
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
fs/namei.c
fs/nfsd/vfs.c
include/linux/kernel.h
net/rxrpc/ar-key.c
security/keys/key.c
security/keys/request_key.c
security/selinux/netif.c

Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc fs/nfsd/vfs.c
Simple merge
index 89a0b8e5a9522b6f581fecb6cd19ae0e18f1017c,95624bed87ef6f8c389e78621b628240bf408208..7c0ad8e385107203c611cb50f25979b8c4970937
@@@ -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(),
Simple merge
Simple merge
Simple merge
Simple merge