From: Takashi Iwai <tiwai@suse•de>
To: Russell King <rmk@arm•linux.org.uk>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, Ben Dooks <ben@simtec•co.uk>,
Mark Brown <broonie@opensource•wolfsonmicro.com>,
Alexander Schulz <alex@shark-linux•de>
Subject: Re: linux-next: manual merge of the sound tree with the arm tree
Date: Wed, 11 Mar 2009 10:18:40 +0100 [thread overview]
Message-ID: <s5h63igifin.wl%tiwai@suse.de> (raw)
In-Reply-To: <20090311085254.GA30970@flint.arm.linux.org.uk>
At Wed, 11 Mar 2009 08:52:54 +0000,
Russell King wrote:
>
> On Tue, Mar 10, 2009 at 02:45:28PM +1100, Stephen Rothwell wrote:
> > Hi Takashi,
> >
> > Today's linux-next merge of the sound tree got a conflict in
> > arch/arm/mach-shark/include/mach/io.h between commit
> > eab184c2362567f2b2e951b7bd0e0d353a7e5091 ("[ARM] 5363/1: Shark cleanup
> > and new defconfig") from the arm tree and commit
> > 8150bc886be5ce3cc301a2baca1fcf2cf7bd7f39 ("S3C24XX: Move and update IIS
> > headers") from the sound tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary.
>
> NAK to this patch.
>
> The greater concern is WTF are cleanup patches for the ARM architecture
> going via the sound tree. Especially patches which I have concerns about.
>
> > --- a/arch/arm/mach-shark/include/mach/io.h
> > +++ b/arch/arm/mach-shark/include/mach/io.h
> > @@@ -11,10 -11,10 +11,10 @@@
> > #ifndef __ASM_ARM_ARCH_IO_H
> > #define __ASM_ARM_ARCH_IO_H
> >
> > -#define PCIO_BASE 0xe0000000
> > -#define IO_SPACE_LIMIT 0xffffffff
> > +#define IO_SPACE_LIMIT 0xffffffff
> >
> > - #define __io(a) ((void __iomem *)(0xe0000000 + (a)))
> > -#define __io(a) __typesafe_io(PCIO_BASE + (a))
> > -#define __mem_pci(addr) (addr)
> > ++#define __io(a) __typesafe_io(0xe0000000 + (a))
>
> Do not use __typesafe_io() with the addition here without first ensuring
> that you've investigated whether it causes the compiler to mis-optimise
> the code.
Hrm, is that particular change also in ARM tree, no? Judging from the
conflict-diff above, it looks like the patch just follows that...
> Takashi - please remove all such patches from the sound tree. They
> should not be in there.
Oh, I thought Mark already sent you Ben's patches.
Sorry if it wasn't done yet.
Basically it's two patches to create a branch to move and update IIS
and audio.h headers. Since some drivers require these changes, they
have to be in the sound tree, too. Otherwise the tree gets
inconsistent and can't be built.
The relevant changes are in another branch (s3c-iis-header) of asoc
tree so that it can be easily pulled to another tree:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git s3c-iis-header
So, if you can pull these changes above into your GIT tree simply via
"git pull", everything will settle down (as both trees share the same
GIT objects).
Please let me know if any better solution comes up.
thanks,
Takashi
next prev parent reply other threads:[~2009-03-11 9:18 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-10 3:45 linux-next: manual merge of the sound tree with the arm tree Stephen Rothwell
2009-03-10 20:04 ` Mark Brown
2009-03-11 0:41 ` Stephen Rothwell
2009-03-11 6:58 ` Takashi Iwai
2009-03-11 8:52 ` Russell King
2009-03-11 9:18 ` Takashi Iwai [this message]
2009-03-11 9:41 ` Russell King
2009-03-11 10:02 ` Takashi Iwai
2009-03-11 10:40 ` Russell King
2009-03-11 11:24 ` Mark Brown
2009-03-11 13:28 ` Takashi Iwai
2009-03-11 22:32 ` Mark Brown
2009-03-12 2:48 ` Stephen Rothwell
2009-03-11 9:49 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2010-07-19 1:00 Stephen Rothwell
2010-07-20 9:03 ` Mark Brown
2010-07-20 20:54 ` Ryan Mallon
2010-07-22 1:28 Stephen Rothwell
2010-07-22 6:18 ` Takashi Iwai
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=s5h63igifin.wl%tiwai@suse.de \
--to=tiwai@suse$(echo .)de \
--cc=alex@shark-linux$(echo .)de \
--cc=ben@simtec$(echo .)co.uk \
--cc=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
--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