Messages in this thread | | | Date | Tue, 24 Apr 2012 14:48:20 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the usb tree |
| |
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@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |