On Wed, Jun 18, 2014 at 09:05:09AM +0200, Jes Sorensen wrote:
> Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> writes:
> > On Mon, Jun 09, 2014 at 03:15:59PM +0200, Jes.Sorensen@xxxxxxxxxx wrote:
> >> From: Jes Sorensen <Jes.Sorensen@xxxxxxxxxx>
> >>
> >> Signed-off-by: Jes Sorensen <Jes.Sorensen@xxxxxxxxxx>
> >> ---
> >> drivers/staging/rtl8723au/core/rtw_ieee80211.c | 29 +++++++++++++-------------
> >> 1 file changed, 14 insertions(+), 15 deletions(-)
> >>
> >> diff --git a/drivers/staging/rtl8723au/core/rtw_ieee80211.c b/drivers/staging/rtl8723au/core/rtw_ieee80211.c
> >> index 2740639..484272e 100644
> >> --- a/drivers/staging/rtl8723au/core/rtw_ieee80211.c
> >> +++ b/drivers/staging/rtl8723au/core/rtw_ieee80211.c
> >> @@ -857,8 +857,9 @@ void rtw_get_bcn_info23a(struct wlan_network *pnetwork)
> >> {
> >> unsigned short cap;
> >> u8 bencrypt = 0;
> >> - /* u8 wpa_ie[255], rsn_ie[255]; */
> >> - u16 wpa_len = 0, rsn_len = 0;
> >> + int pie_len, ie_offset;
> >> + u8 *pie;
> >> + const u8 *p;
> >>
> >> cap = get_unaligned_le16(
> >> rtw_get_capability23a_from_ie(pnetwork->network.IEs));
> >
> > This patch fails to apply to the tree for this hunk. Which worries me,
> > and indicates that somehow we are out of sync. The previous 6 patches
> > all applied properly, but with some fuzz.
> >
> > As you are the only one who has touched this file, something is odd.
> > Can you respin this series, starting here, against my staging-next
> > branch on kernel.org and resend them?
>
> Crap, I'll have a look.
>
> Is there some smart way to figure out which commits are in one branch
> and another rather than just applying and running git diff?
Try rebasing your tree on the branch and see what happens.
Or use quilt :)
good luck,
greg k-h
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
