linux-next: manual merge of the mips tree with Linus' tree

[Stephen Rothwell]

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
arch/mips/include/asm/octeon/octeon-model.h between commit a1ce39288e6f
("UAPI: (Scripted) Convert #include "..." to #include <path/...> in
kernel system headers") from the  tree and commit 5cf02e5554a4 ("MIPS:
OCTEON: Add detection of cnf71xx parts") from the mips tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/mips/include/asm/octeon/octeon-model.h
index 23b895c,93398f6..0000000
--- a/arch/mips/include/asm/octeon/octeon-model.h
+++ b/arch/mips/include/asm/octeon/octeon-model.h
@@@ -313,6 -323,14 +323,14 @@@ static inline int __octeon_is_model_run
  const char *octeon_model_get_string(uint32_t chip_id);
  const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer);
  
+ /*
+  * Return the octeon family, i.e., ProcessorID of the PrID register.
+  */
+ static inline uint32_t cvmx_get_octeon_family(void)
+ {
+ 	return cvmx_get_proc_id() & OCTEON_FAMILY_MASK;
+ }
+ 
 -#include "octeon-feature.h"
 +#include <asm/octeon/octeon-feature.h>
  
  #endif /* __OCTEON_MODEL_H__ */

Attachment: pgp00000.pgp
Description: PGP signature