Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/usbip/userspace/src/utils.h between commit e44ba033c565
("treewide: remove duplicate includes") from the trivial tree and commit
4cbab52d18fc ("staging: usbip: userspace: move header includes out
utils.h") from the staging tree.
The latter supercedes the former, so I used it.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgphLjENtYmCe.pgp
Description: PGP signature
