Re: + git-net-git-rejects.patch added to -mm tree

[Andrew Morton <akpm@linux-foundation.org>]

On Mon, 05 May 2008 12:51:18 -0700 (PDT)
David Miller <davem@davemloft.net> wrote:

> From: akpm@linux-foundation.org
> Date: Mon, 05 May 2008 12:05:40 -0700
> 
> > Subject: git-net-git-rejects
> > 
> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> 
> What happened here?

I'm still working out how to incorporate linux-next so I didn't really look
at the actual specfics of this problem.

I noticed that there were rather a lot of changes in
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
which are not in linux-next, perhaps due to time lag.

So I generated a diff between linux-next and net-2.6.git using my rather
wonky script to do that.  This script does tend to muck things up
sometimes.

Then on top of origin.patch, linux-next.patch, the above git-net.patch and
this fixup I generated git-net-next.patch from
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
and that appeared to apply cleanly.

It's all rather complex and I haven't yet got down to working out what's
actually happening.

> Did you apply Ingo's IRDA build fixup patches, like I did, and clean
> them up or change them in some way?

umm, let me see.

No, I think it's a genuine conflict.  linux-next has

commit 01c419104cca3d512a24e160447355487fcfe21c
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date:   Fri Mar 28 10:54:43 2008 -0600

    nsc-ircc: wrap PNP probe code in #ifdef CONFIG_PNP
    
and that conflicts with the irda changes in your tree.



I don't know how that patch got into linux-next.  I thought that Len merged
Bjorn's changes, but that patch doesn't have Len's signoff and that patch
doesn't appear in
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test