On 2014/1/6 9:35, David Miller wrote: > From: Yijing Wang <wangyijing@xxxxxxxxxx> > Date: Mon, 6 Jan 2014 09:08:28 +0800 > >> This patch has been merged in Bjorn's pci tree, so will have some conflict between yours and Bjorn's tree? > > GIT will figure it out just fine. OK, thanks very much! > > -- Thanks! Yijing -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
