linux-next: manual merge of the moduleh tree with the arm tree

linux-next: manual merge of the moduleh tree with the arm tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
arch/arm/mach-bcmring/mm.c between commit 2d5e975b2194 ("ARM:
mach-bcmring: Setup consistent dma size at boot time") from the arm tree
and commit 9bc7d81e271e ("arm: fix implicit use of page.h in
mach-bcmring/mach-jornada") from the moduleh tree.

Jst context changes I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-bcmring/mm.c
index 8616876,293b6d3..0000000
--- a/arch/arm/mach-bcmring/mm.c
+++ b/arch/arm/mach-bcmring/mm.c
@@@ -13,7 -13,7 +13,8 @@@
  *****************************************************************************/
  
  #include <linux/platform_device.h>
 +#include <linux/dma-mapping.h>
+ #include <asm/page.h>
  #include <asm/mach/map.h>
  
  #include <mach/hardware.h>

Re: linux-next: manual merge of the moduleh tree with the arm tree

[Paul Gortmaker]

On 11-08-25 01:17 AM, Stephen Rothwell wrote:
> Hi Paul,
> 
> Today's linux-next merge of the moduleh tree got a conflict in
> arch/arm/mach-bcmring/mm.c between commit 2d5e975b2194 ("ARM:
> mach-bcmring: Setup consistent dma size at boot time") from the arm tree
> and commit 9bc7d81e271e ("arm: fix implicit use of page.h in
> mach-bcmring/mach-jornada") from the moduleh tree.

I can't really relocate the page.h inclusion in a trivial way to
make this conflict go away.  But since the implicit header use fixes
for arm are independent and don't actually depend on anything in the
rest of the module.h tree, I can set about to giving these to Russell
for his arm-next branch anytime.  I'll do that shortly.

Thanks,
Paul.

> 
> Jst context changes I fixed it up (see below) and can carry the fix as
> necessary.

Re: linux-next: manual merge of the moduleh tree with the arm tree

[Russell King]

On Thu, Aug 25, 2011 at 12:33:51PM -0400, Paul Gortmaker wrote:
> On 11-08-25 01:17 AM, Stephen Rothwell wrote:
> > Hi Paul,
> > 
> > Today's linux-next merge of the moduleh tree got a conflict in
> > arch/arm/mach-bcmring/mm.c between commit 2d5e975b2194 ("ARM:
> > mach-bcmring: Setup consistent dma size at boot time") from the arm tree
> > and commit 9bc7d81e271e ("arm: fix implicit use of page.h in
> > mach-bcmring/mach-jornada") from the moduleh tree.
> 
> I can't really relocate the page.h inclusion in a trivial way to
> make this conflict go away.  But since the implicit header use fixes
> for arm are independent and don't actually depend on anything in the
> rest of the module.h tree, I can set about to giving these to Russell
> for his arm-next branch anytime.  I'll do that shortly.

For such a trivial conflict, I don't think we need to do anything.  Linus
has said publically that he likes to sort out conflicts as it allows him
to have a wider knowledge of what's going on in the kernel tree.

So, given that the fixup is soo obvious, I don't think we need to play
games redistributing patches - we just need to be aware of the conflict
and mention it to Linus when we merge.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

Re: linux-next: manual merge of the moduleh tree with the arm tree

[Paul Gortmaker]

On 11-08-25 12:39 PM, Russell King wrote:
> On Thu, Aug 25, 2011 at 12:33:51PM -0400, Paul Gortmaker wrote:
>> On 11-08-25 01:17 AM, Stephen Rothwell wrote:
>>> Hi Paul,
>>>
>>> Today's linux-next merge of the moduleh tree got a conflict in
>>> arch/arm/mach-bcmring/mm.c between commit 2d5e975b2194 ("ARM:
>>> mach-bcmring: Setup consistent dma size at boot time") from the arm tree
>>> and commit 9bc7d81e271e ("arm: fix implicit use of page.h in
>>> mach-bcmring/mach-jornada") from the moduleh tree.
>>
>> I can't really relocate the page.h inclusion in a trivial way to
>> make this conflict go away.  But since the implicit header use fixes
>> for arm are independent and don't actually depend on anything in the
>> rest of the module.h tree, I can set about to giving these to Russell
>> for his arm-next branch anytime.  I'll do that shortly.
> 
> For such a trivial conflict, I don't think we need to do anything.  Linus
> has said publically that he likes to sort out conflicts as it allows him
> to have a wider knowledge of what's going on in the kernel tree.
> 
> So, given that the fixup is soo obvious, I don't think we need to play
> games redistributing patches - we just need to be aware of the conflict
> and mention it to Linus when we merge.

OK.  I was entertaining feeding some of the really obvious and simple
parts of the moduleh branch out to the various maintainers just to
reduce its overall size, but in the end I guess that just makes work
for me and them -- vs. a single pull request to Linus for addition to
v3.2-rc1.   I'll just stay the course and Stephen will have to rerere
the merge conflict resolution for a while -- something I'm certain
that he has automated long long ago.

Thanks,
Paul.

Re: linux-next: manual merge of the moduleh tree with the arm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 704 bytes --]

Hi Paul,

On Thu, 25 Aug 2011 18:40:54 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> OK.  I was entertaining feeding some of the really obvious and simple
> parts of the moduleh branch out to the various maintainers just to
> reduce its overall size, but in the end I guess that just makes work
> for me and them -- vs. a single pull request to Linus for addition to
> v3.2-rc1.   I'll just stay the course and Stephen will have to rerere
> the merge conflict resolution for a while -- something I'm certain
> that he has automated long long ago.

Yeah, that's fine.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

linux-next: manual merge of the moduleh tree with the arm tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
arch/arm/common/scoop.c between commit 2f8163baada3 ("ARM: gpio: convert
includes of mach/gpio.h and asm/gpio.h to linux/gpio.h") from the arm
tree and commit d8e58c821f3e ("arm: Add export.h to ARM specific files as
required") from the moduleh tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/common/scoop.c
index 1cde34a,98288e4..0000000
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@@ -17,6 -16,8 +17,7 @@@
  #include <linux/slab.h>
  #include <linux/platform_device.h>
  #include <linux/io.h>
+ #include <linux/export.h>
 -#include <asm/gpio.h>
  #include <asm/hardware/scoop.h>
  
  /* PCMCIA to Scoop linkage