Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/line6/driver.c between commit 2b8dec323d34 ("USB:
driver.c: remove err() usage") from the usb tree and commit c46b8a6567fb
("Staging: line6: only allocate a buffer if it is needed") (and later)
from the staging tree.
The latter supercedes the former, so I used that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgp2ROGgbDXtm.pgp
Description: PGP signature
