All of lore.kernel.org
 help / color / mirror / Atom feed
From: "John W. Linville" <linville@tuxdriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kalle Valo <kvalo@qca.qualcomm.com>, Greg KH <gregkh@suse.de>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>,
	Raja Mani <rmani@qca.qualcomm.com>,
	linux-wireless <linux-wireless@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)
Date: Fri, 12 Aug 2011 09:51:02 -0400	[thread overview]
Message-ID: <20110812135101.GA2286@tuxdriver.com> (raw)
In-Reply-To: <20110812121216.28e6979b44bacb651849640b@canb.auug.org.au>

On Fri, Aug 12, 2011 at 12:12:16PM +1000, Stephen Rothwell wrote:
> Hi Kalle, Greg,
> 
> On Thu, 11 Aug 2011 18:50:57 +0300 Kalle Valo <kvalo@qca.qualcomm.com> wrote:
> >
> > On 08/11/2011 05:16 PM, Greg KH wrote:
> > > On Thu, Aug 11, 2011 at 11:05:42AM +0300, Kalle Valo wrote:
> > >
> > >> Yes, the cleaned up version of ath6kl is now in wireless-next and the
> > >> staging version can be removed in 3.2. Greg, how do you want to handle
> > >> removal of the staging version? Should I send a patch to you removing
> > >> it? Or should I send the patch to John?
> > > 
> > > Just tell me.  Should I really delete drivers/staging/ath6kl/ for the
> > > 3.2 kernel release?  If so, I'll gladly do so in my tree so linux-next
> > > will be fine for issues like this in the future.
> > 
> > Yes, please delete ath6kl from staging for the 3.2 release as the
> > cleanup version is now in wireless-next.
> > 
> > Thank you everyone and sorry for the mess.
> 
> I think that the removal should be done in the wirelesss tree so that
> Linus' tree is not broken during the next merge window.
> 
> I have added the removal patch as a merge fixup one the merge of the
> wireless tree for today.

Makes sense to me -- probably also is more sane if there is some fool
out there relying on the ath6kl driver in staging that doesn't know
about the switch to the wireless tree.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

  reply	other threads:[~2011-08-12 14:00 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-11  5:55 linux-next: build failure after merge of the final tree (wireless & staging trees related) Stephen Rothwell
2011-08-11  8:05 ` Kalle Valo
2011-08-11  8:05   ` Kalle Valo
     [not found]   ` <4E438D56.5020801-A+ZNKFmMK5xy9aJCnZT0Uw@public.gmane.org>
2011-08-11 14:16     ` Greg KH
2011-08-11 14:16       ` Greg KH
     [not found]       ` <20110811141604.GA14763-l3A5Bk7waGM@public.gmane.org>
2011-08-11 15:50         ` Kalle Valo
2011-08-11 15:50           ` Kalle Valo
2011-08-12  2:12           ` Stephen Rothwell
2011-08-12  2:12             ` Stephen Rothwell
2011-08-12 13:51             ` John W. Linville [this message]
2011-08-12 14:13               ` Kalle Valo
2011-08-12 14:13                 ` Kalle Valo
2011-08-12 17:32                 ` Greg KH
     [not found]                   ` <20110812173255.GE14182-l3A5Bk7waGM@public.gmane.org>
2011-08-12 19:24                     ` Kalle Valo
2011-08-12 19:24                       ` Kalle Valo
     [not found]                   ` <1313176080-21794-1-git-send-email-kvalo@qca.qualcomm.com>
2011-08-12 19:31                     ` [PATCH] staging: remove ath6kl Greg KH
2011-08-23 21:30                 ` linux-next: build failure after merge of the final tree (wireless & staging trees related) Greg KH
2011-08-24  1:06                   ` Stephen Rothwell

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=20110812135101.GA2286@tuxdriver.com \
    --to=linville@tuxdriver.com \
    --cc=gregkh@suse.de \
    --cc=kvalo@qca.qualcomm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=rmani@qca.qualcomm.com \
    --cc=sfr@canb.auug.org.au \
    --cc=vthiagar@qca.qualcomm.com \
    /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.