public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: "J.A. Magallon" <jamagallon@able.es>, Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: Re: 2.6.10-rc3-mm1
Date: Mon, 13 Dec 2004 08:06:49 -0800	[thread overview]
Message-ID: <20041213160649.GA11397@kroah.com> (raw)
In-Reply-To: <1102950109l.7596l.0l@werewolf.able.es>

On Mon, Dec 13, 2004 at 03:01:49PM +0000, J.A. Magallon wrote:
> 
> On 2004.12.13, Andrew Morton wrote:
> > 
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.10-rc3/2.6.10-rc3-mm1/
> > 
> 
> I remember that people agreed that this should not be _GPL:
> 
> http://marc.theaimsgroup.com/?l=linux-kernel&m=109935991217693&w=2
> 
> --- linux-2.6.10-rc2-jam2/drivers/base/class_simple.c.orig	2004-11-21 23:47:05.000000000 +0100
> +++ linux-2.6.10-rc2-jam2/drivers/base/class_simple.c	2004-11-21 23:47:46.000000000 +0100

It's there due to the way bk works.  I just rebuilt my driver-2.6 tree a
while ago, and Andrew had these changesets in his tree.  Then he pulled
again, and these changes stayed in his local tree.

So, to fix this, Andrew needs to blow away his driver-2.6 tree and clone
it again.  Not too tough :)

thanks,

greg k-h

  reply	other threads:[~2004-12-13 17:07 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-12-13 10:03 2.6.10-rc3-mm1 Andrew Morton
2004-12-13 10:31 ` 2.6.10-rc3-mm1 Kasper Sandberg
2004-12-13 10:36   ` 2.6.10-rc3-mm1 Andrew Morton
2004-12-13 20:27     ` 2.6.10-rc3-mm1 Nigel Cunningham
2004-12-13 12:02 ` 2.6.10-rc3-mm1 Christoph Hellwig
2004-12-13 15:01 ` 2.6.10-rc3-mm1 J.A. Magallon
2004-12-13 16:06   ` Greg KH [this message]
2004-12-13 16:15 ` 2.6.10-rc3-mm1 Marcos D. Marado Torres
2004-12-13 17:02   ` 2.6.10-rc3-mm1 Fabio Coatti
2004-12-13 18:10   ` 2.6.10-rc3-mm1 Rudmer van Dijk
2004-12-13 19:33     ` 2.6.10-rc3-mm1 Andrew Morton
2004-12-13 19:49       ` 2.6.10-rc3-mm1 Rudmer van Dijk
2004-12-13 21:06     ` 2.6.10-rc3-mm1 Felipe Alfaro Solana
2004-12-13 20:08 ` 2.6.10-rc3-mm1 Stephen Smalley
2004-12-14  4:10 ` [patch] 2.6.10-rc3-mm1: fix net/tulip/xircom_tulip_cb.c warning Adrian Bunk
2004-12-14 16:04 ` 2.6.10-rc3-mm1 (compile stats) John Cherry
2004-12-15 10:41   ` Paul Rolland
2004-12-15 16:16     ` John Cherry
2004-12-15 11:35 ` 2.6.10-rc3-mm1 William Lee Irwin III
2004-12-15 11:42   ` 2.6.10-rc3-mm1 Andrew Morton
2004-12-17  2:51     ` 2.6.10-rc3-mm1 William Lee Irwin III
2004-12-17  7:55       ` 2.6.10-rc3-mm1 Andrew Morton
2004-12-17 12:00         ` 2.6.10-rc3-mm1 William Lee Irwin III
2004-12-17 12:18           ` 2.6.10-rc3-mm1 Hugh Dickins
2004-12-16 17:49 ` 2.6.10-rc3-mm1 Nathan Lynch

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=20041213160649.GA11397@kroah.com \
    --to=greg@kroah.com \
    --cc=akpm@osdl.org \
    --cc=jamagallon@able.es \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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