From: Greg Ungerer <gerg@snapgear.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: Re: linux-next: manual merge of the m68knommu tree with the tree
Date: Thu, 18 Oct 2012 13:34:08 +1000 [thread overview]
Message-ID: <507F78B0.70808@snapgear.com> (raw)
In-Reply-To: <20121018103826.c8e1312904747b31caa376f6@canb.auug.org.au>
Hi Stephen,
On 18/10/12 09:38, Stephen Rothwell wrote:
> [Just cc'ing Geert]
>
> On Thu, 18 Oct 2012 10:37:13 +1100 Stephen Rothwell <sfr@canb.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 ...
I think that is right. Thanks.
Regards
Greg
>> From: Stephen Rothwell <sfr@canb.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@canb.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
>
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
next prev parent reply other threads:[~2012-10-18 3:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-17 23:37 linux-next: manual merge of the m68knommu tree with the tree Stephen Rothwell
2012-10-17 23:38 ` Stephen Rothwell
2012-10-18 3:34 ` Greg Ungerer [this message]
2012-10-18 5:51 ` Geert Uytterhoeven
2012-10-18 10:01 ` Greg Ungerer
2012-10-18 11:13 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=507F78B0.70808@snapgear.com \
--to=gerg@snapgear.com \
--cc=dhowells@redhat.com \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox