From: Mark Brown <broonie@kernel•org>
To: Russell King <rmk+kernel@arm•linux.org.uk>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded•com>,
Felipe Balbi <balbi@ti•com>
Cc: linux-usb@vger•kernel.org, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org,
Thierry Reding <thierry.reding@gmail•com>
Subject: linux-next: manual merge of the usb-gadget tree
Date: Thu, 10 Oct 2013 22:20:30 +0100 [thread overview]
Message-ID: <20131010212030.GV21581@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
Today's linux-next merge of the usb-gadget tree got conflicts in
drivers/usb/musb/davinci.c caused by an add in ea78201e2 (usb: musb:
davinci: fix resources passed to MUSB driver for DM6467) adjacent to
the modification of the device registration in 4c9ad1059 (DMA-API: usb:
musb: use platform_device_register_full() to avoid directly messing with
dma masks) from the ARM tree.
I've fixed trivially and can carry as required.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-10-10 21:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-10 21:20 Mark Brown [this message]
[not found] ` <20131010212030.GV21581-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2013-10-10 21:26 ` linux-next: manual merge of the usb-gadget tree Felipe Balbi
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=20131010212030.GV21581@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=balbi@ti$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-usb@vger$(echo .)kernel.org \
--cc=rmk+kernel@arm$(echo .)linux.org.uk \
--cc=sergei.shtylyov@cogentembedded$(echo .)com \
--cc=thierry.reding@gmail$(echo .)com \
/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