linux-kernel - Re: linux-next: manual merge of the char-misc tree with the ia64 tree

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140715134458.GB17795@kroah.com>
Date:	Tue, 15 Jul 2014 06:44:58 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Arnd Bergmann <arnd@...db.de>,
	"Chen, Gong" <gong.chen@...ux.intel.com>,
	Tony Luck <tony.luck@...el.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Andreas Noever <andreas.noever@...il.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the ia64 tree

On Tue, Jul 15, 2014 at 04:43:49PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got conflicts in
> drivers/Kconfig and drivers/Makefile between commit 76ac8275f296
> ("trace, RAS: Add basic RAS trace event") from the ia64 tree and commit
> 16603153666d ("thunderbolt: Add initial cactus ridge NHI support") from
> the char-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, 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/