linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [patch 0/7] SSB: New patch series for merge
@ 2007-08-14 17:00 Michael Buesch
  2007-08-14 17:34 ` Larry Finger
  0 siblings, 1 reply; 4+ messages in thread
From: Michael Buesch @ 2007-08-14 17:00 UTC (permalink / raw)
  To: John Linville; +Cc: linux-wireless, bcm43xx-dev

Hi John,

This patch series catches SSB up to my
current wireless-development patchset.

Please merge this into wireless-dev ssb branch.


-- 


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch 0/7] SSB: New patch series for merge
  2007-08-14 17:00 [patch 0/7] SSB: New patch series for merge Michael Buesch
@ 2007-08-14 17:34 ` Larry Finger
  2007-08-14 17:38   ` Michael Buesch
  0 siblings, 1 reply; 4+ messages in thread
From: Larry Finger @ 2007-08-14 17:34 UTC (permalink / raw)
  To: Michael Buesch; +Cc: John Linville, linux-wireless, bcm43xx-dev

Michael Buesch wrote:
> Hi John,
> 
> This patch series catches SSB up to my
> current wireless-development patchset.
> 
> Please merge this into wireless-dev ssb branch.

I had a problem with #7. My copy of John's tree still has EXPERIMENTAL for ssb. Yours does not.

The differences are:

--- ../ssb_patch7_from_MB       2007-08-14 12:27:51.000000000 -0500
+++ patches/ssb_patch7_works  2007-08-14 12:26:31.000000000 -0500
@@ -15,7 +15,7 @@
  +
   config SSB
         tristate "Sonics Silicon Backplane support"
--      depends on HAS_IOMEM
+-      depends on EXPERIMENTAL && HAS_IOMEM
  +      depends on SSB_POSSIBLE
         help
  -        Support for the Sonics Silicon Backplane bus
@@ -50,12 +50,12 @@

  +config SSB_PCMCIAHOST_POSSIBLE
  +      bool
-+      depends on SSB && PCMCIA && EXPERIMENTAL
++      depends on SSB && PCMCIA
  +      default y
  +
   config SSB_PCMCIAHOST
-       bool "Support for SSB on PCMCIA-bus host (EXPERIMENTAL)"
--      depends on SSB && PCMCIA && EXPERIMENTAL
+       bool "Support for SSB on PCMCIA-bus host"
+-      depends on SSB && PCMCIA
  +      depends on SSB_PCMCIAHOST_POSSIBLE
         help
           Support for a Sonics Silicon Backplane on top

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch 0/7] SSB: New patch series for merge
  2007-08-14 17:34 ` Larry Finger
@ 2007-08-14 17:38   ` Michael Buesch
  2007-08-14 22:18     ` Larry Finger
  0 siblings, 1 reply; 4+ messages in thread
From: Michael Buesch @ 2007-08-14 17:38 UTC (permalink / raw)
  To: Larry Finger; +Cc: John Linville, linux-wireless, bcm43xx-dev

On Tuesday 14 August 2007 19:34:08 Larry Finger wrote:
> Michael Buesch wrote:
> > Hi John,
> > 
> > This patch series catches SSB up to my
> > current wireless-development patchset.
> > 
> > Please merge this into wireless-dev ssb branch.
> 
> I had a problem with #7. My copy of John's tree still has EXPERIMENTAL for ssb. Yours does not.

Are you sure you have latest wireless-dev? It has
been rebased again.

-- 
Greetings Michael.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch 0/7] SSB: New patch series for merge
  2007-08-14 17:38   ` Michael Buesch
@ 2007-08-14 22:18     ` Larry Finger
  0 siblings, 0 replies; 4+ messages in thread
From: Larry Finger @ 2007-08-14 22:18 UTC (permalink / raw)
  To: Michael Buesch; +Cc: linux-wireless, bcm43xx-dev

Michael Buesch wrote:
> On Tuesday 14 August 2007 19:34:08 Larry Finger wrote:
>> Michael Buesch wrote:
>>> Hi John,
>>>
>>> This patch series catches SSB up to my
>>> current wireless-development patchset.
>>>
>>> Please merge this into wireless-dev ssb branch.
>> I had a problem with #7. My copy of John's tree still has EXPERIMENTAL for ssb. Yours does not.
> 
> Are you sure you have latest wireless-dev? It has
> been rebased again.
> 

Indeed, that was the problem. Once I got John's email and learned how to handle the new rebase, you 
patch applied just fine.

Larry



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2007-08-14 22:18 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-14 17:00 [patch 0/7] SSB: New patch series for merge Michael Buesch
2007-08-14 17:34 ` Larry Finger
2007-08-14 17:38   ` Michael Buesch
2007-08-14 22:18     ` Larry Finger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).