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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 5 May 2008 13:09:11 -0700
From:	Andrew Morton <akpm@...ux-foundation.org>
To:	David Miller <davem@...emloft.net>
Cc:	linux-kernel@...r.kernel.org, linux-next@...r.kernel.org
Subject: Re: + git-net-git-rejects.patch added to -mm tree

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

> From: akpm@...ux-foundation.org
> Date: Mon, 05 May 2008 12:05:40 -0700
> 
> > Subject: git-net-git-rejects
> > 
> > Signed-off-by: Andrew Morton <akpm@...ux-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@...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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/