From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Daney <ddaney@caviumnetworks•com>,
Ralf Baechle <ralf@linux-mips•org>,
Anatolij Gustschin <agust@denx•de>
Subject: linux-next: manual merge of the usb tree with the mips tree
Date: Mon, 18 Oct 2010 17:09:11 +1100 [thread overview]
Message-ID: <20101018170911.63f76c60.sfr@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/Makefile between commit
cd97084c3aff6f1037e00ee711a872719b60441d ("USB: Add EHCI and OHCH glue
for OCTEON II SOCs") from the mips tree and commit
f668f1e9868f9bc1bed3d5df1701879ac89cc3ed ("USB: add platform glue driver
for FSL USB DR controller") from the usb tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/usb/host/Makefile
index 36099ce,91c5a1b..0000000
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@@ -33,5 -33,4 +33,5 @@@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66
obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o
obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o
obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o
+obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o
-
+ obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o
next reply other threads:[~2010-10-18 6:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-18 6:09 Stephen Rothwell [this message]
2010-10-19 15:47 ` linux-next: manual merge of the usb tree with the mips tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2017-09-04 5:51 Stephen Rothwell
2017-09-04 9:17 ` Greg KH
2015-06-04 8:39 Stephen Rothwell
2015-06-05 10:53 ` Greg KH
2015-06-03 6:48 Stephen Rothwell
2010-10-18 6:06 Stephen Rothwell
2010-10-19 15:46 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101018170911.63f76c60.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agust@denx$(echo .)de \
--cc=ddaney@caviumnetworks$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox