linux-kernel - Re: linux-next: manual merge of the tip tree with the pci 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] [day] [month] [year] [list]

Message-ID: <alpine.DEB.2.11.1411241147180.6439@nanos>
Date:	Mon, 24 Nov 2014 11:51:32 +0100 (CET)
From:	Thomas Gleixner <tglx@...utronix.de>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
cc:	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Bjorn Helgaas <bhelgaas@...gle.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jingoo Han <jg1.han@...sung.com>,
	Yijing Wang <wangyijing@...wei.com>
Subject: Re: linux-next: manual merge of the tip tree with the pci tree

On Mon, 24 Nov 2014, Stephen Rothwell wrote:
> Today's linux-next merge of the tip tree got a conflict in
> drivers/pci/host/pcie-rcar.c between commit 3c70637f7569 ("PCI: rcar:
> Make rcar_pci static") from the pci tree and commit 7c35c8cc32f3 ("PCI:
> rcar: Save MSI controller in pci_sys_data") from the tip tree.

Bjorn redid his pci/msi branch. The older version of this branch has
been in the tip/tree to base a larger set of MSI irq related changes
on it. I rebased on Bjorns latest so that conflict should be gone
tomorrow.

Thanks,

	tglx

	
--
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/