On 03/20/2014 01:52 PM, Peter Wu wrote:
Hi,

The first patch of these series was NAKed some weeks ago because it would
conflict with the new rtl8723be driver. Since those changes are in wireless-next
now, I have adjusted that patch to take care of rtl8723be.

The other two patches to the staging driver is similar to the rtlwifi changes.
I am not sure who to send these two patches to. Greg is the staging maintainer,
but John takes wireless patches, so I have included both of you.

All patches are compile-tested on top of v3.14-rc2-938-g67b3bd4.

I also found the following (unrelated to my patches) warning while compiling the
staging driver, perhaps it needs a closer look?

Peter,

Your Patch 1/3 applies cleanly and I think it is OK, but if you are going to do cleanups on the wireless tree, you should be working from the latest version of wireless-testing git repo. We are on 3.14-rc7 and there are several recent commits that might have conflicted.

As for the changes to staging/rtl8821ae (No. 2 & 3), once Linus starts the merge that will precede the release of 3.15-rc2, the entire code for rtl8821ae will be replaced. A cleaned-up version was nearly ready for the regular wireless tree in time to make 3.15, but it did not get enough testing. As a result, that driver will be in testing for one more cycle. By 3.16, it should reside in the regular tree and be out of staging.

Pushing patches that affect both the regular tree and staging is complicated and should be avoided whenever possible.

Larry



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to