From: Michael Buesch <mb@bu3sch.de>
To: Andrew Morton <akpm@linux-foundation.org>,
John Linville <linville@tuxdriver.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>,
Felix Fietkau <nbd@openwrt.org>,
linux-wireless@vger.kernel.org
Subject: Re: [PATCH] ssb: Make extif driver compilation depend on extif config
Date: Thu, 9 Aug 2007 11:54:49 +0200 [thread overview]
Message-ID: <200708091154.50193.mb@bu3sch.de> (raw)
In-Reply-To: <20070808172843.f98cb2de.akpm@linux-foundation.org>
On Thursday 09 August 2007 02:28:43 Andrew Morton wrote:
> On Thu, 9 Aug 2007 02:20:32 +0200
> Michael Buesch <mb@bu3sch.de> wrote:
>
> > On Thursday 09 August 2007, Andrew Morton wrote:
> > > Still confused.
> > >
> > > I pull
> > > git+ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-dev.git#mm-master
> > > into -mm. Could be that John puts other things into other trees which do
> > > not appear in #mm-master, I don't know.
> > >
> > > Given that you are the developer and maintainer of ssb it is appropriate
> > > (especially at this stage) that you run a tree. Just a plain old quilt
> > > tree like
> > > http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver/
> > > would be fine.
> > >
> > > If that tree is relative to some tree which John is running then that's OK,
> > > as long as someone tells me where to get that tree from.
> > >
> > > Or just merge all of SSB via John's tree. I don't think it matters that
> > > it's not strictly a wireless thing.
> >
> > I can live with doing it through John.
> > And as bcm43xx depends on ssb we are doomed to go through
> > John's tree.
> > So if you always pull John's tree, you'll be up to date with
> > wireless + ssb.
> >
> > So if you drop everything b44, bcm43xx and ssb related
> > and pull John's tree, it will compile again.
>
> But I pull John's tree daily, and I don't receive all that ssb stuff. I
> assume his is not including it in the #mm-master branch.
>
> > So, my question: How is the mainline merge going to happen?
> > Do you handle that, or do I have to generate some split-out
> > patches for ssb (I have a script for that).
>
> If the master version of ssb is in one of John's branches then he can ask
> Linus to merge that branch into mainline.
Ok, I see. A rebase of wireless-dev is needed anyway, so this
should not be a problem.
So John, when you rebase your tree, can you make a seperate branch
for the ssb stuff? I can supply you with the initial broken out
patch to start it.
--
Greetings Michael.
next prev parent reply other threads:[~2007-08-09 9:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-07 15:44 [PATCH] ssb: Make extif driver compilation depend on extif config Michael Buesch
2007-08-08 22:48 ` Andrew Morton
2007-08-08 23:13 ` Aurelien Jarno
2007-08-08 23:43 ` Andrew Morton
2007-08-08 23:58 ` Andrew Morton
2007-08-09 0:02 ` Michael Buesch
2007-08-09 0:10 ` Andrew Morton
2007-08-09 0:20 ` Michael Buesch
2007-08-09 0:28 ` Andrew Morton
2007-08-09 9:54 ` Michael Buesch [this message]
2007-08-09 9:44 ` Aurelien Jarno
2007-08-09 0:13 ` Andrew Morton
2007-08-09 14:01 ` John W. Linville
2007-08-09 14:38 ` Michael Buesch
2007-08-09 13:53 ` John W. Linville
2007-08-09 14:08 ` Michael Buesch
2007-08-09 14:23 ` John W. Linville
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=200708091154.50193.mb@bu3sch.de \
--to=mb@bu3sch.de \
--cc=akpm@linux-foundation.org \
--cc=aurelien@aurel32.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=nbd@openwrt.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.