Re: linux-next: manual merge of the tip tree with the arm64 tree

[Catalin Marinas]

On Fri, May 23, 2014 at 07:28:44AM +0100, Stephen Rothwell wrote:
> diff --cc arch/arm64/include/asm/thread_info.h
> index 9c086c63f911,7b8e3a2a00fb..000000000000
> --- a/arch/arm64/include/asm/thread_info.h
> +++ b/arch/arm64/include/asm/thread_info.h
> @@@ -103,12 -99,7 +102,11 @@@ static inline struct thread_info *curre
>   #define TIF_SIGPENDING		0
>   #define TIF_NEED_RESCHED	1
>   #define TIF_NOTIFY_RESUME	2	/* callback before returning to user */
>  +#define TIF_FOREIGN_FPSTATE	3	/* CPU's FP state is not current's */
>   #define TIF_SYSCALL_TRACE	8
>  +#define TIF_SYSCALL_AUDIT	9
>  +#define TIF_SYSCALL_TRACEPOINT	10
>  +#define TIF_SECCOMP		11
> - #define TIF_POLLING_NRFLAG	16
>   #define TIF_MEMDIE		18	/* is terminating due to OOM killer */
>   #define TIF_FREEZE		19
>   #define TIF_RESTORE_SIGMASK	20

It looks fine, thanks.

-- 
Catalin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/