From: Greg KH <gregkh@linuxfoundation•org>
To: Larry Finger <Larry.Finger@lwfinger•net>
Cc: devel@driverdev•osuosl.org, netdev@vger•kernel.org
Subject: Re: [PATCH] staging: r8821ae: Remove driver from staging
Date: Mon, 29 Sep 2014 18:04:17 -0400 [thread overview]
Message-ID: <20140929220417.GB1628@kroah.com> (raw)
In-Reply-To: <5429A015.1000700@lwfinger.net>
On Mon, Sep 29, 2014 at 01:08:21PM -0500, Larry Finger wrote:
> On 09/29/2014 12:05 PM, Greg KH wrote:
> >On Sun, Sep 28, 2014 at 08:39:51PM -0500, Larry Finger wrote:
> >>A new version of this driver has been merged into the wireless-testing tree
> >>as commit 21e4b0726dc671c423e2dc9a85364716219c4502. It is both possible and
> >>desirable to delete the staging version to avoid build errors in linux-next.
> >>
> >>Signed-off-by: Larry Finger <Larry.Finger@lwfinger•net>
> >>---
> >>
> >>Greg,
> >>
> >>This removal patch was generated after commit 368c75b98bdfdfad54e7f165016819ef344e3587.
> >>It should apply to your tree unless further modifications have been made to
> >>the staging driver.
> >
> >Something is odd with this patch, it doesn't apply, even against that
> >commit id:
> >Applying: staging: r8821ae: Remove driver from staging
> >error: patch failed: drivers/staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.c:1
> >error: drivers/staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.c: patch does not apply
> >Patch failed at 0001 staging: r8821ae: Remove driver from staging
> >The copy of the patch that failed is found in:
> > /home/gregkh/linux/work/staging/.git/rebase-apply/patch
> >When you have resolved this problem, run "git am --continue".
> >If you prefer to skip this patch, run "git am --skip" instead.
> >To restore the original branch and stop patching, run "git am --abort".
> >
> >Can you refresh against the staging-next branch of staging.git and try it
> >again? Or I can just delete it "by hand" which is fine with me, and might be
> >easier fro you, just let me know.
>
> I was on the staging-next branch, but when I pulled after receiving this
> mail, I got a conflict due to some change in
> drivers/staging/rtl8821ae/pci.c. That one must have been in your local copy,
> but not yet pushed when I pulled.
>
> If you don't mind doing the delete there, the traffic on the Cc sites will
> be reduced. I'm sure you know what is needed, but just in case, delete the
> files in drivers/staging/rtl8821ae/ and the Makefile and Kconfig entries in
> drivers/staging/.
Great, I've done this now in the staging-next tree, it will be merged
for 3.18-rc1.
Thanks for doing this work.
greg k-h
prev parent reply other threads:[~2014-09-29 22:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-29 1:39 [PATCH] staging: r8821ae: Remove driver from staging Larry Finger
2014-09-29 6:17 ` Greg KH
2014-09-29 14:45 ` Larry Finger
2014-09-29 17:05 ` Greg KH
2014-09-29 18:08 ` Larry Finger
2014-09-29 22:04 ` Greg KH [this message]
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=20140929220417.GB1628@kroah.com \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=Larry.Finger@lwfinger$(echo .)net \
--cc=devel@driverdev$(echo .)osuosl.org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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