linux-kernel - linux-next: manual merge of the usb tree with the trivial tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 2 Sep 2010 13:01:18 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	JiebingLi <jiebing.li@...el.com>, Joe Perches <joe@...ches.com>,
	Jiri Kosina <jkosina@...e.cz>
Subject: linux-next: manual merge of the usb tree with the trivial tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/gadget/langwell_udc.c between commit
7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
unnecessary return's from void functions") from the trivial tree and
commit 0f92bbacd2d1a26e8bf863d2cc05572df43bf7fb ("USB: langwell: USB
Client driver code cleanup") from the usb tree.

Just context changes.  I fixed it up (see below) and can carry the fix
while necessary.  Though, if that trivial tree commit was in the usb tree,
the conflict could be resolved there ...
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/usb/gadget/langwell_udc.c
index d41b69c,1ef17a6..0000000
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@@ -283,7 -253,8 +253,7 @@@ static void ep0_reset(struct langwell_u
  		ep_reset(&dev->ep[0], 0, i, USB_ENDPOINT_XFER_CONTROL);
  	}
  
- 	VDBG(dev, "<--- %s()\n", __func__);
+ 	dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__);
 -	return;
  }
  
  
@@@ -1484,7 -1501,8 +1500,7 @@@ static void langwell_udc_start(struct l
  	usbcmd |= CMD_RUNSTOP;
  	writel(usbcmd, &dev->op_regs->usbcmd);
  
- 	DBG(dev, "<--- %s()\n", __func__);
+ 	dev_dbg(&dev->pdev->dev, "<--- %s()\n", __func__);
 -	return;
  }
  
  
@@@ -1506,7 -1524,8 +1522,7 @@@ static void langwell_udc_stop(struct la
  	usbcmd &= ~CMD_RUNSTOP;
  	writel(usbcmd, &dev->op_regs->usbcmd);
  
- 	DBG(dev, "<--- %s()\n", __func__);
+ 	dev_dbg(&dev->pdev->dev, "<--- %s()\n", __func__);
 -	return;
  }
  
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/