linux-next: manual merge of the iommufd tree with the iommu tree

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

 



Hi all,

Today's linux-next merge of the iommufd tree got conflicts in:

  drivers/iommu/iommu.c
  include/linux/iommu.h

between commits from the iommu and iommufd trees.

I don't have time to disentangle this, so I have just dropped the iommufd
tree for today.  Please coordinate.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpANTXSMdZv5.pgp
Description: OpenPGP digital signature


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

  Powered by Linux