All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@osdl.org>
To: Michael Buesch <mb@bu3sch.de>
Cc: linville@tuxdriver.com, jeff@garzik.org, netdev@vger.kernel.org,
	torvalds@osdl.org
Subject: Re: Please pull upstream-fixes branch of wireless-2.6
Date: Thu, 20 Apr 2006 01:57:52 -0700	[thread overview]
Message-ID: <20060420015752.01d36087.akpm@osdl.org> (raw)
In-Reply-To: <200604201051.03881.mb@bu3sch.de>

Michael Buesch <mb@bu3sch.de> wrote:
>
> On Thursday 20 April 2006 03:12, John W. Linville wrote:
> >       bcm43xx: fix dyn tssi2dbm memleak
> >       bcm43xx: fix pctl slowclock limit calculation
> >       bcm43xx: sysfs code cleanup
> 
> These are already in -mm and on their way into linus's tree.

I don't send netdev patches to Linus except under unusual circumstances. 
I'd expect these patches to go upstream via John or Jeff.

> Is it possible to cause problems?

Nope, I'll just drop then when they appear in a git tree.

And I really need to find a way of getting git-wireless into -mm.  Problem
is, it's based off git-netdev-all and when John's tree is synced to a later
version of Linus's tree than Jeff's tree, all hell breaks loose at my end. 
Junio and I weren't able to work out a way of extracting the jeff->john
diffs so I gave up.

Probably, I'll need to actually do a git merge, generate the diff then
throw away the resulting git tree.  Or something.  I've avoided doing git
merges because I'm dealing with 58 trees and I suspect I'd go insane.

> If not, fine. If yes, we need some clearly defined rules where
> to put patches and a clearly defined statement of how often
> patches are pushed upstream.

Because I don't carry git-wireless I don't have visibility of when John has
merged something.  Ordinarily you'd have seen me drop the patches again
when they popped up in John's tree.



  reply	other threads:[~2006-04-20  8:58 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-04-20  1:12 Please pull upstream-fixes branch of wireless-2.6 John W. Linville
2006-04-20  8:51 ` Michael Buesch
2006-04-20  8:57   ` Andrew Morton [this message]
2006-04-20  9:12     ` Michael Buesch
2006-04-20 12:53     ` John W. Linville
2006-04-20 19:58       ` Andrew Morton
2006-04-20 22:28         ` Linus Torvalds
2006-04-20  9:00   ` Jeff Garzik
2006-04-20 21:36 ` Jeff Garzik
  -- strict thread matches above, loose matches on Subject: below --
2006-04-24 19:40 Please pull 'upstream-fixes' " John W. Linville
2006-04-26 10:17 ` Jeff Garzik
2006-05-06  1:06 Please pull upstream-fixes " John W. Linville
2006-05-06  3:08 ` Andrew Morton
2006-05-06  3:20   ` Linus Torvalds
2006-05-06  4:12     ` Stephen Hemminger
2006-05-06 13:45       ` John W. Linville
2006-05-17 19:34 Please pull 'upstream-fixes' " John W. Linville
2006-05-22 19:18 John W. Linville
2006-05-24  4:26 ` Jeff Garzik
2006-05-24  8:52   ` Andrew Morton
2006-05-26 20:37 John W. Linville
2006-05-27  1:26 ` Jeff Garzik
2006-06-05 21:53 John W. Linville
2006-06-08 19:46 ` Jeff Garzik
2006-07-10 21:29 John W. Linville
2006-07-28  0:22 John W. Linville
2006-07-29  4:32 ` Jeff Garzik
2006-08-02 21:56 John W. Linville
2006-08-03 21:19 ` Jeff Garzik
2006-08-04 20:58 John W. Linville
2006-08-09  3:48 ` Jeff Garzik
2006-08-23 18:46 John W. Linville
2006-08-24  4:41 ` Jeff Garzik
2006-09-11 23:58 John W. Linville
2006-09-12 15:42 ` Jeff Garzik
2006-10-17 21:34 John W. Linville
2006-10-21 18:22 ` Jeff Garzik
2006-11-08  4:58 John W. Linville
2006-11-10 16:11 ` Jeff Garzik
2006-11-15  1:29 John W. Linville
2006-11-28 19:14 ` John W. Linville
2006-12-21  3:03 John W. Linville
2006-12-26 21:39 ` Jeff Garzik
2007-01-03  2:41 John W. Linville
2007-01-18 15:48 John W. Linville
2007-01-18 16:46 ` Jeff Garzik
2007-02-02 21:27 Please pull "upstream-fixes" " John W. Linville
2007-02-07  0:06 ` Jeff Garzik
2007-02-07  0:06   ` Jeff Garzik
2007-02-27 20:50 Please pull 'upstream-fixes' " John W. Linville
2007-03-03  0:41 ` Jeff Garzik
2007-03-08  3:30 John W. Linville
2007-03-09 16:58 ` Jeff Garzik
2007-03-16 21:31 John W. Linville
2007-03-27 18:26 John W. Linville
2007-03-28  6:21 ` Jeff Garzik
2007-04-10 20:23 John W. Linville
2007-04-11 15:58 ` Jeff Garzik
2007-05-22 15:17 John W. Linville
2007-05-22 15:17 John W. Linville
2007-05-24 21:17 ` Jeff Garzik
2007-05-29 18:30 John W. Linville
2007-05-29 18:30 ` John W. Linville
2007-05-30 13:46 ` Jeff Garzik
2007-05-30 13:46   ` Jeff Garzik

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=20060420015752.01d36087.akpm@osdl.org \
    --to=akpm@osdl.org \
    --cc=jeff@garzik.org \
    --cc=linville@tuxdriver.com \
    --cc=mb@bu3sch.de \
    --cc=netdev@vger.kernel.org \
    --cc=torvalds@osdl.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.