Re: linux-next: manual merge of the staging tree with the net and trivial trees

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Jul 07, 2011 at 03:38:40PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/bcm/headers.h
> drivers/staging/brcm80211/brcmfmac/dhd_linux.c
> drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
> drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h between commits
> 219eb47e6f35 ("net/staging: add needed interrupt.h and hardirq.h
> includes") from the net tree and e44ba033c565 ("treewide: remove
> duplicate includes") from the trivial tree and various commits from the
> staging tree.
> 
> I fixed thme up (see below) and can carry the fixes as necessary.

Looks correct, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux