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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 7 Jul 2011 06:43:04 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Vitaliy Ivanov <vitalivanov@...il.com>,
	Jiri Kosina <jkosina@...e.cz>,
	Roland Vossen <rvossen@...adcom.com>,
	Arend van Spriel <arend@...adcom.com>,
	Franky Lin <frankyl@...adcom.com>
Subject: Re: linux-next: manual merge of the staging tree with the net and
 trivial trees

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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/