linux-next: manual merge of the rr tree with the tree

linux-next: manual merge of the rr tree with the tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/x86/kernel/cpu/mcheck/mce{,_64}.c between commit mce_init_device
("x86, mce: Rename sysfs variables") from the  tree and commit
10242805fc2c7f25d63097426def1bb3c8545db9 ("cpumask: alloc zeroed cpumask
for static cpumask_var_ts") from the rr tree.

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

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
index 1d0aa9c,705bc24..0000000
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@@ -1297,7 -1163,7 +1297,7 @@@ static __init int mce_init_device(void
  	if (!mce_available(&boot_cpu_data))
  		return -EIO;
  
- 	alloc_cpumask_var(&mce_dev_initialized, GFP_KERNEL);
 -	alloc_cpumask_var(&mce_device_initialized, GFP_KERNEL | __GFP_ZERO);
++	alloc_cpumask_var(&mce_dev_initialized, GFP_KERNEL | __GFP_ZERO);
  
  	err = mce_init_banks();
  	if (err)

Re: linux-next: manual merge of the rr tree with the tree

[Stephen Rothwell]

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

Hi all,

On Tue, 9 Jun 2009 13:56:27 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the rr tree got a conflict in
> arch/x86/kernel/cpu/mcheck/mce{,_64}.c between commit mce_init_device
> ("x86, mce: Rename sysfs variables") from the  tree and commit
                                               ^^^
x86

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the rr tree with the tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
drivers/net/sfc/efx.c between commit
3977d0334b98770b81dfeb248db232c9bb3d3c88 ("sfc: modify allocation error
message") from Linus' tree and commit
c735805e707362aa397ad3e78c16c616b3ec7399 ("cpumask: use zalloc_cpumask_var
() where possible") from the rr tree.

I fixed it up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/sfc/efx.c
index 343e8da,23ee983..0000000
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@@ -884,9 -894,9 +884,9 @@@ static int efx_wanted_rx_queues(void
  	int count;
  	int cpu;
  
- 	if (unlikely(!alloc_cpumask_var(&core_mask, GFP_KERNEL))) {
 -	if (!zalloc_cpumask_var(&core_mask, GFP_KERNEL)) {
++	if (unlikely(!zalloc_cpumask_var(&core_mask, GFP_KERNEL))) {
  		printk(KERN_WARNING
 -		       "efx.c: allocation failure, irq balancing hobbled\n");
 +		       "sfc: RSS disabled due to allocation failure\n");
  		return 1;
  	}
  

linux-next: manual merge of the rr tree with the tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/m68k/kernel/module_mm.c arch/m68k/kernel/module_no.c between commit
4528acce2607 ("m68k: merge the non-mmu and mmu versions of module.c")
from the m68knommu tree and commit 7b935befe6bc ("modules: make arch's
use default loader hooks") from the rr tree.

The former removes these files, so I did that.

I then added this merge fix up patch (which I can carry as necessary and
may not be coorrect):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 5 Jul 2011 13:12:26 +1000
Subject: [PATCH] modules/m68k: make arch's use default loader hooks

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/m68k/kernel/module.c |   27 ---------------------------
 1 files changed, 0 insertions(+), 27 deletions(-)

diff --git a/arch/m68k/kernel/module.c b/arch/m68k/kernel/module.c
index 146d646..34849c4 100644
--- a/arch/m68k/kernel/module.c
+++ b/arch/m68k/kernel/module.c
@@ -19,29 +19,6 @@
 
 #ifdef CONFIG_MODULES
 
-void *module_alloc(unsigned long size)
-{
-	if (size == 0)
-		return NULL;
-	return vmalloc(size);
-}
-
-
-/* Free memory returned from module_alloc */
-void module_free(struct module *mod, void *module_region)
-{
-	vfree(module_region);
-}
-
-/* We don't need anything special. */
-int module_frob_arch_sections(Elf_Ehdr *hdr,
-			      Elf_Shdr *sechdrs,
-			      char *secstrings,
-			      struct module *mod)
-{
-	return 0;
-}
-
 int apply_relocate(Elf32_Shdr *sechdrs,
 		   const char *strtab,
 		   unsigned int symindex,
@@ -130,10 +107,6 @@ int module_finalize(const Elf_Ehdr *hdr,
 	return 0;
 }
 
-void module_arch_cleanup(struct module *mod)
-{
-}
-
 #endif /* CONFIG_MODULES */
 
 void module_fixup(struct module *mod, struct m68k_fixup_info *start,
-- 
1.7.5.4


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: manual merge of the rr tree with the tree

[Jonas Bonn]

On Tue, 2011-07-05 at 13:59 +1000, Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next merge of the rr tree got a conflict in
> arch/m68k/kernel/module_mm.c arch/m68k/kernel/module_no.c between commit
> 4528acce2607 ("m68k: merge the non-mmu and mmu versions of module.c")
> from the m68knommu tree and commit 7b935befe6bc ("modules: make arch's
> use default loader hooks") from the rr tree.
> 
> The former removes these files, so I did that.
> 
> I then added this merge fix up patch (which I can carry as necessary and
> may not be coorrect):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 5 Jul 2011 13:12:26 +1000
> Subject: [PATCH] modules/m68k: make arch's use default loader hooks
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/m68k/kernel/module.c |   27 ---------------------------
>  1 files changed, 0 insertions(+), 27 deletions(-)
> 

That patch looks good to me.

Acked-by: Jonas Bonn <jonas@southpole.se>

/Jonas

Re: linux-next: manual merge of the rr tree with the tree

[Greg Ungerer]

On 07/07/11 01:57, Jonas Bonn wrote:
>
> On Tue, 2011-07-05 at 13:59 +1000, Stephen Rothwell wrote:
>> Hi Rusty,
>>
>> Today's linux-next merge of the rr tree got a conflict in
>> arch/m68k/kernel/module_mm.c arch/m68k/kernel/module_no.c between commit
>> 4528acce2607 ("m68k: merge the non-mmu and mmu versions of module.c")
>> from the m68knommu tree and commit 7b935befe6bc ("modules: make arch's
>> use default loader hooks") from the rr tree.
>>
>> The former removes these files, so I did that.
>>
>> I then added this merge fix up patch (which I can carry as necessary and
>> may not be coorrect):
>>
>> From: Stephen Rothwell<sfr@canb.auug.org.au>
>> Date: Tue, 5 Jul 2011 13:12:26 +1000
>> Subject: [PATCH] modules/m68k: make arch's use default loader hooks
>>
>> Signed-off-by: Stephen Rothwell<sfr@canb.auug.org.au>
>> ---
>>   arch/m68k/kernel/module.c |   27 ---------------------------
>>   1 files changed, 0 insertions(+), 27 deletions(-)
>>
>
> That patch looks good to me.
>
> Acked-by: Jonas Bonn<jonas@southpole.se>

Looks fine to me too:

Acked-by: Greg Ungerer <gerg@uclinux.org>

Thanks
Greg


------------------------------------------------------------------------
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

Re: linux-next: manual merge of the rr tree with the tree

[Stephen Rothwell]

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

Hi all,

On Thu, 7 Jul 2011 09:44:51 +1000 Greg Ungerer <gerg@snapgear.com> wrote:
>
> On 07/07/11 01:57, Jonas Bonn wrote:
> >
> > On Tue, 2011-07-05 at 13:59 +1000, Stephen Rothwell wrote:
> >>
> >> Today's linux-next merge of the rr tree got a conflict in
> >> arch/m68k/kernel/module_mm.c arch/m68k/kernel/module_no.c between commit
> >> 4528acce2607 ("m68k: merge the non-mmu and mmu versions of module.c")
> >> from the m68knommu tree and commit 7b935befe6bc ("modules: make arch's
> >> use default loader hooks") from the rr tree.
> >>
> >> The former removes these files, so I did that.
> >>
> >> I then added this merge fix up patch (which I can carry as necessary and
> >> may not be coorrect):
> >>
> >> From: Stephen Rothwell<sfr@canb.auug.org.au>
> >> Date: Tue, 5 Jul 2011 13:12:26 +1000
> >> Subject: [PATCH] modules/m68k: make arch's use default loader hooks
> >>
> >> Signed-off-by: Stephen Rothwell<sfr@canb.auug.org.au>
> >> ---
> >>   arch/m68k/kernel/module.c |   27 ---------------------------
> >>   1 files changed, 0 insertions(+), 27 deletions(-)
> >>
> >
> > That patch looks good to me.
> >
> > Acked-by: Jonas Bonn<jonas@southpole.se>
> 
> Looks fine to me too:
> 
> Acked-by: Greg Ungerer <gerg@uclinux.org>

OK, so now someone just has to remember to apply it (or tell Linus, or
fix up the trees) during the merge window.   That person probably won't
be me (since I will not be online next week (assuming Linus follows
through and opens the merge window next week).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the rr tree with the tree

[Rusty Russell]

On Thu, 7 Jul 2011 10:24:32 +1000, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
... 
> > Acked-by: Greg Ungerer <gerg@uclinux.org>
> 
> OK, so now someone just has to remember to apply it (or tell Linus, or
> fix up the trees) during the merge window.   That person probably won't
> be me (since I will not be online next week (assuming Linus follows
> through and opens the merge window next week).

I'm travelling next week too, so m68k will probably get merged first,
and hence I'll roll in this fix myself.

Thanks,
Rusty.

Re: linux-next: manual merge of the rr tree with the tree

[Jonathan Cameron]

On 07/07/11 02:07, Rusty Russell wrote:
> On Thu, 7 Jul 2011 10:24:32 +1000, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi all,
> .... 
>>> Acked-by: Greg Ungerer <gerg@uclinux.org>
>>
>> OK, so now someone just has to remember to apply it (or tell Linus, or
>> fix up the trees) during the merge window.   That person probably won't
>> be me (since I will not be online next week (assuming Linus follows
>> through and opens the merge window next week).
> 
> I'm travelling next week too, so m68k will probably get merged first,
> and hence I'll roll in this fix myself.
> 
> Thanks,
> Rusty.
Rusty?

If not I'm happy to take on adapting this to meet everyone's requirements.


Jonathan

Re: linux-next: manual merge of the rr tree with the tree

[Rusty Russell]

On Tue, 19 Jul 2011 12:27:42 +0100, Jonathan Cameron <jic23@cam.ac.uk> wrote:
> On 07/07/11 02:07, Rusty Russell wrote:
> > On Thu, 7 Jul 2011 10:24:32 +1000, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >> Hi all,
> > .... 
> >>> Acked-by: Greg Ungerer <gerg@uclinux.org>
> >>
> >> OK, so now someone just has to remember to apply it (or tell Linus, or
> >> fix up the trees) during the merge window.   That person probably won't
> >> be me (since I will not be online next week (assuming Linus follows
> >> through and opens the merge window next week).
> > 
> > I'm travelling next week too, so m68k will probably get merged first,
> > and hence I'll roll in this fix myself.
> > 
> > Thanks,
> > Rusty.
> Rusty?
> 
> If not I'm happy to take on adapting this to meet everyone's requirements.

It's trivial code... just please send to Linus first day of merge
window, and when I rebase I'll fix this up.

Thanks,
Rusty.

Re: linux-next: manual merge of the rr tree with the tree

[Stephen Rothwell]

Hi Greg,

On Thu, 7 Jul 2011 10:24:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 7 Jul 2011 09:44:51 +1000 Greg Ungerer <gerg@snapgear.com> wrote:
> >
> > On 07/07/11 01:57, Jonas Bonn wrote:
> > >
> > > On Tue, 2011-07-05 at 13:59 +1000, Stephen Rothwell wrote:
> > >>
> > >> Today's linux-next merge of the rr tree got a conflict in
> > >> arch/m68k/kernel/module_mm.c arch/m68k/kernel/module_no.c between commit
> > >> 4528acce2607 ("m68k: merge the non-mmu and mmu versions of module.c")
> > >> from the m68knommu tree and commit 7b935befe6bc ("modules: make arch's
> > >> use default loader hooks") from the rr tree.
> > >>
> > >> The former removes these files, so I did that.
> > >>
> > >> I then added this merge fix up patch (which I can carry as necessary and
> > >> may not be coorrect):
> > >>
> > >> From: Stephen Rothwell<sfr@canb.auug.org.au>
> > >> Date: Tue, 5 Jul 2011 13:12:26 +1000
> > >> Subject: [PATCH] modules/m68k: make arch's use default loader hooks
> > >>
> > >> Signed-off-by: Stephen Rothwell<sfr@canb.auug.org.au>
> > >> ---
> > >>   arch/m68k/kernel/module.c |   27 ---------------------------
> > >>   1 files changed, 0 insertions(+), 27 deletions(-)
> > >>
> > >
> > > That patch looks good to me.
> > >
> > > Acked-by: Jonas Bonn<jonas@southpole.se>
> > 
> > Looks fine to me too:
> > 
> > Acked-by: Greg Ungerer <gerg@uclinux.org>
> 
> OK, so now someone just has to remember to apply it (or tell Linus, or
> fix up the trees) during the merge window.   That person probably won't
> be me (since I will not be online next week (assuming Linus follows
> through and opens the merge window next week).

This patch now needs to be applied to the m68knommu tree (after merging
Linus' tree) as Rusty's changes have gone upstream.

Here is the patch I have applied again for reference:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 5 Jul 2011 13:12:26 +1000
Subject: [PATCH] modules/m68k: make arch's use default loader hooks

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/m68k/kernel/module.c |   27 ---------------------------
 1 files changed, 0 insertions(+), 27 deletions(-)

diff --git a/arch/m68k/kernel/module.c b/arch/m68k/kernel/module.c
index 146d646..34849c4 100644
--- a/arch/m68k/kernel/module.c
+++ b/arch/m68k/kernel/module.c
@@ -19,29 +19,6 @@
 
 #ifdef CONFIG_MODULES
 
-void *module_alloc(unsigned long size)
-{
-	if (size == 0)
-		return NULL;
-	return vmalloc(size);
-}
-
-
-/* Free memory returned from module_alloc */
-void module_free(struct module *mod, void *module_region)
-{
-	vfree(module_region);
-}
-
-/* We don't need anything special. */
-int module_frob_arch_sections(Elf_Ehdr *hdr,
-			      Elf_Shdr *sechdrs,
-			      char *secstrings,
-			      struct module *mod)
-{
-	return 0;
-}
-
 int apply_relocate(Elf32_Shdr *sechdrs,
 		   const char *strtab,
 		   unsigned int symindex,
@@ -130,10 +107,6 @@ int module_finalize(const Elf_Ehdr *hdr,
 	return 0;
 }
 
-void module_arch_cleanup(struct module *mod)
-{
-}
-
 #endif /* CONFIG_MODULES */
 
 void module_fixup(struct module *mod, struct m68k_fixup_info *start,
-- 
1.7.5.4


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: manual merge of the rr tree with the tree

[Greg Ungerer]

Hi Stephen,

On 25/07/11 11:43, Stephen Rothwell wrote:
> Hi Greg,
>
> On Thu, 7 Jul 2011 10:24:32 +1000 Stephen Rothwell<sfr@canb.auug.org.au>  wrote:
>>
>> On Thu, 7 Jul 2011 09:44:51 +1000 Greg Ungerer<gerg@snapgear.com>  wrote:
>>>
>>> On 07/07/11 01:57, Jonas Bonn wrote:
>>>>
>>>> On Tue, 2011-07-05 at 13:59 +1000, Stephen Rothwell wrote:
>>>>>
>>>>> Today's linux-next merge of the rr tree got a conflict in
>>>>> arch/m68k/kernel/module_mm.c arch/m68k/kernel/module_no.c between commit
>>>>> 4528acce2607 ("m68k: merge the non-mmu and mmu versions of module.c")
>>>>> from the m68knommu tree and commit 7b935befe6bc ("modules: make arch's
>>>>> use default loader hooks") from the rr tree.
>>>>>
>>>>> The former removes these files, so I did that.
>>>>>
>>>>> I then added this merge fix up patch (which I can carry as necessary and
>>>>> may not be coorrect):
>>>>>
>>>>> From: Stephen Rothwell<sfr@canb.auug.org.au>
>>>>> Date: Tue, 5 Jul 2011 13:12:26 +1000
>>>>> Subject: [PATCH] modules/m68k: make arch's use default loader hooks
>>>>>
>>>>> Signed-off-by: Stephen Rothwell<sfr@canb.auug.org.au>
>>>>> ---
>>>>>    arch/m68k/kernel/module.c |   27 ---------------------------
>>>>>    1 files changed, 0 insertions(+), 27 deletions(-)
>>>>>
>>>>
>>>> That patch looks good to me.
>>>>
>>>> Acked-by: Jonas Bonn<jonas@southpole.se>
>>>
>>> Looks fine to me too:
>>>
>>> Acked-by: Greg Ungerer<gerg@uclinux.org>
>>
>> OK, so now someone just has to remember to apply it (or tell Linus, or
>> fix up the trees) during the merge window.   That person probably won't
>> be me (since I will not be online next week (assuming Linus follows
>> through and opens the merge window next week).
>
> This patch now needs to be applied to the m68knommu tree (after merging
> Linus' tree) as Rusty's changes have gone upstream.
>
> Here is the patch I have applied again for reference:

Thanks Stephen, I saw this morning too. I have just now (as of about
30 minutes ago) fixed this patch, and pushed it up to the m68knommu git
tree.

I'll probably be sending a pull request to Linus later today.

Thanks
Greg


> From: Stephen Rothwell<sfr@canb.auug.org.au>
> Date: Tue, 5 Jul 2011 13:12:26 +1000
> Subject: [PATCH] modules/m68k: make arch's use default loader hooks
>
> Signed-off-by: Stephen Rothwell<sfr@canb.auug.org.au>
> ---
>   arch/m68k/kernel/module.c |   27 ---------------------------
>   1 files changed, 0 insertions(+), 27 deletions(-)
>
> diff --git a/arch/m68k/kernel/module.c b/arch/m68k/kernel/module.c
> index 146d646..34849c4 100644
> --- a/arch/m68k/kernel/module.c
> +++ b/arch/m68k/kernel/module.c
> @@ -19,29 +19,6 @@
>
>   #ifdef CONFIG_MODULES
>
> -void *module_alloc(unsigned long size)
> -{
> -	if (size == 0)
> -		return NULL;
> -	return vmalloc(size);
> -}
> -
> -
> -/* Free memory returned from module_alloc */
> -void module_free(struct module *mod, void *module_region)
> -{
> -	vfree(module_region);
> -}
> -
> -/* We don't need anything special. */
> -int module_frob_arch_sections(Elf_Ehdr *hdr,
> -			      Elf_Shdr *sechdrs,
> -			      char *secstrings,
> -			      struct module *mod)
> -{
> -	return 0;
> -}
> -
>   int apply_relocate(Elf32_Shdr *sechdrs,
>   		   const char *strtab,
>   		   unsigned int symindex,
> @@ -130,10 +107,6 @@ int module_finalize(const Elf_Ehdr *hdr,
>   	return 0;
>   }
>
> -void module_arch_cleanup(struct module *mod)
> -{
> -}
> -
>   #endif /* CONFIG_MODULES */
>
>   void module_fixup(struct module *mod, struct m68k_fixup_info *start,


-- 
------------------------------------------------------------------------
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