Re: linux-next: manual merge of the usb tree with Linus' tree

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

From: Jiri Kosina

Subject: Re: linux-next: manual merge of the usb tree with Linus' tree

Date: Thursday, August 5, 2010 - 3:17 am

On Thu, 5 Aug 2010, Stephen Rothwell wrote:

quoted text> Today's linux-next merge of the usb tree got a conflict in
> Documentation/usb/linux.inf between commit
> 0ea6e61122196509af82cc4f36cbdaacbefb8227 ("Documentation: update broken
> web addresses") from Linus' tree and commit
> 2e73ce9389be011587a0ca581b6798b135e64807 ("USB: gadget: g_ether: updated
> INF file") from the usb tree.
> 
> The URL that was fixed by the former was removed by the latter, so I just
> used the latter version.

I see. Greg, will you just rebase the patch in USB tree on top of current 
Linus' tree please?

Thanks,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
unsubscribe noticeTo unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:

Re: linux-next: manual merge of the usb tree with Linus' tree, Jiri Kosina, (Thu Aug 5, 3:17 am)

Re: linux-next: manual merge of the usb tree with Linus' tree, MichaÅ Nazarewicz, (Thu Aug 5, 3:35 am)

Re: linux-next: manual merge of the usb tree with Linus' tree, Greg KH, (Thu Aug 5, 3:36 pm)


linux-kernel:
Paul Turner	[tg_shares_up rewrite v4 11/11] sched: update tg->shares after cpu.shares write
Mr. James W. Laferriere	Re: Linux 2.6.25-rc1 , syntax error near unexpected token `;'
Robin Lee Powell	NFS hang + umount -f: better behaviour requested.
Linus Torvalds	Linux 2.6.34-rc4
Colin Cross	[PATCH 12/21] ARM: tegra: Add suspend and hotplug support
git:
Fredrik Kuivinen	Re: fatal: unable to create '.git/index': File exists
Wink Saville	How-to combine several separate git repos?
Emily Ren	How to pull remote branch with specified commit id?
Denis Bueno	Git clone error
pradeep singh	git-update-server-info may be required,cannot clone and pull from a remote reposit...
openbsd-misc:
Sevan / Venture37	Re: This is what Linus Torvalds calls openBSD crowd
Netmaffia.hu	Tini Lányok AKCIÓBAN OTTHON
Siju George	This is what Linus Torvalds calls openBSD crowd
Darrin Chandler	Re: OT: Python (was Re: vi in /bin)
frantisek holop	Re: splassert: vwakeup: and friends
linux-netdev:
Jamie Lokier	Re: POHMELFS high performance network filesystem. Transactions, failover, performa...
Timo Teräs	ip xfrm policy semantics
Ron Mercer	[net-next PATCH 2/2] qlge: Version change to v1.00.00.27
Maciej W. Rozycki	Re: [PATCH] flush_work_sync vs. flush_scheduled_work Re: [PATCH] PHYLIB: IRQ event...
Jarek Poplawski	Re: socket api problem: can't bind an ipv6 socket to ::ffff:0.0.0.0
git-commits-head:
Linux Kernel Mailing List	powerpc/fsl_msi: enable msi allocation in all banks
Linux Kernel Mailing List	ASoC: fix registration of the SoC card in the Freescale MPC8610 drivers
Linux Kernel Mailing List	drivers/acpi: use kasprintf
Linux Kernel Mailing List	bnx2x: Moving includes
Linux Kernel Mailing List	[ARM] mmp: add dma support to mmp2