From: David Miller <davem@davemloft•net>
To: sfr@canb•auug.org.au
Cc: linux-next@vger•kernel.org, sam@ravnborg•org
Subject: Re: linux-next: manual merge of the sparc tree
Date: Thu, 17 Jul 2008 23:07:29 -0700 (PDT) [thread overview]
Message-ID: <20080717.230729.193700407.davem@davemloft.net> (raw)
In-Reply-To: <20080716173913.3b4050ff.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 16 Jul 2008 17:39:13 +1000
> Today's linux-next merge of the sparc tree got conflicts in
> include/asm-sparc64/mmu.h, include/asm-sparc64/page.h and
> include/asm-sparc64/pgtable.h between commit
> 5cd012990ab37dbef7d84cc74feb70ef5f792a12 ("sparc64: Remove 4MB and 512K
> base page size options") from the sparc-current tree and commit
> 0d4b5053275562b4ff7a9a98942936c9eb9b5c18 ("sparc: join the remaining
> header files") from the sparc tree.
>
> I applied the appropriate parts of the sparc-current commit to
> include/asm-sparc/{mmu,page,pgtable}_64.h.
Stephen, thanks for all of these sparc merge conflict reports.
I'm respinning my sparc tree tonight and that should take care of all
of the conflicts.
next prev parent reply other threads:[~2008-07-18 6:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-16 7:39 linux-next: manual merge of the sparc tree Stephen Rothwell
2008-07-18 6:07 ` David Miller [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-09-16 20:27 Stephen Rothwell
2008-09-16 21:31 ` David Miller
2008-09-16 21:40 ` Stephen Rothwell
2008-09-04 1:17 Stephen Rothwell
2008-09-04 1:17 ` David Miller
2008-09-04 4:14 ` Stephen Rothwell
2008-07-16 7:31 Stephen Rothwell
2008-07-16 7:19 Stephen Rothwell
2008-07-16 7:23 ` Stephen Rothwell
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=20080717.230729.193700407.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sam@ravnborg$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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