On Mon, Mar 7, 2016 at 1:49 PM, Kalle Valo <kvalo@xxxxxxxxxxxxxx> wrote: > Kalle Valo <kvalo@xxxxxxxxxxxxxx> writes: > >> 1 patches skipped: >> >> [17/21] brcmfmac: fix sdio sg table alloc crash >> >> There was a conflict so please rebase that patch: >> >> Applying: brcmfmac: fix sdio sg table alloc crash >> fatal: sha1 information is lacking or useless (drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c). >> Repository lacks necessary blobs to fall back on 3-way merge. >> Cannot fall back to three-way merge. >> Patch failed at 0001 brcmfmac: fix sdio sg table alloc crash > > Ah, I noticed only now your comment that this patch is in > wireless-drivers already. So no actions needed. > > But in the future please don't submit the same patch twice, otherwise I > accidentally commit it twice which is bad. Instead document the > dependency and we can sort it out. Yeah. We already discussed this earlier [1]. Has been noted. Thanks, Arend [1] http://article.gmane.org/gmane.linux.kernel.wireless.general/148691 > -- > Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
