lkml.org 
[lkml]   [2012]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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/serqt_usb2/serqt_usb2.c between commit e8656b02ef35
("USB: serial: serqt_usb2: remove dbg() usage") from the usb tree and
commit 623c2bb2c59a ("staging: serqt_usb2: fix dbg print when kzalloc
failed to allocate qt_port") from the staging tree.

The former removes the line changed by the latter, so I just did that (no
action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-09-19 07:01    [W:0.040 / U:2.296 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site