linux-kernel - Re: linux-next: manual merge of the m68knommu tree with the tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20121018103826.c8e1312904747b31caa376f6@canb.auug.org.au>
Date:	Thu, 18 Oct 2012 10:38:26 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg Ungerer <gerg@...pgear.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Howells <dhowells@...hat.com>,
	Geert Uytterhoeven <geert@...ux-m68k.org>
Subject: Re: linux-next: manual merge of the m68knommu tree with the  tree

[Just cc'ing Geert]

On Thu, 18 Oct 2012 10:37:13 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi Greg,
> 
> Today's linux-next merge of the m68knommu tree got conflicts in
> arch/m68k/include/asm/termios.h, arch/m68k/include/uapi/asm/auxvec.h,
> arch/m68k/include/uapi/asm/msgbuf.h, arch/m68k/include/uapi/asm/sembuf.h,
> arch/m68k/include/uapi/asm/shmbuf.h, arch/m68k/include/uapi/asm/socket.h,
> arch/m68k/include/uapi/asm/sockios.h and
> arch/m68k/include/uapi/asm/termbits.h between commit 10b3a979347d ("UAPI:
> (Scripted) Disintegrate arch/m68k/include/asm") from the m68k-current
> tree and various commits from the m68knommu tree that use the asm-generic
> versions.
> 
> I just deleted all those files and added the following merge fix patch
> and can carry the fix as necessary.
> 
> I think that this is the correct thing to do ...
> 
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Thu, 18 Oct 2012 10:32:20 +1100
> Subject: [PATCH] m68k: fix up for UAPI changes
> 
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  arch/m68k/include/uapi/asm/Kbuild |    8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
> index 972bce1..aebdbf5 100644
> --- a/arch/m68k/include/uapi/asm/Kbuild
> +++ b/arch/m68k/include/uapi/asm/Kbuild
> @@ -2,25 +2,17 @@
>  include include/uapi/asm-generic/Kbuild.asm
>  
>  header-y += a.out.h
> -header-y += auxvec.h
>  header-y += byteorder.h
>  header-y += cachectl.h
>  header-y += fcntl.h
>  header-y += ioctls.h
> -header-y += msgbuf.h
>  header-y += param.h
>  header-y += poll.h
>  header-y += posix_types.h
>  header-y += ptrace.h
> -header-y += sembuf.h
>  header-y += setup.h
> -header-y += shmbuf.h
>  header-y += sigcontext.h
>  header-y += signal.h
> -header-y += socket.h
> -header-y += sockios.h
>  header-y += stat.h
>  header-y += swab.h
> -header-y += termbits.h
> -header-y += termios.h
>  header-y += unistd.h
> -- 
> 1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped