From: Felipe Balbi <balbi@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Felipe Balbi <balbi@ti.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Jingoo Han <jg1.han@samsung.com>
Subject: Re: linux-next: manual merge of the usb-gadget tree with Linus' tree
Date: Mon, 8 Sep 2014 08:28:14 -0500 [thread overview]
Message-ID: <20140908132814.GD22409@saruman.home> (raw)
In-Reply-To: <20140908171311.414b05d2@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 636 bytes --]
On Mon, Sep 08, 2014 at 05:13:11PM +1000, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/phy/phy-samsung-usb.h between commit bbc66e140bab ("usb:
> phy: samsung: Fix wrong bit mask for PHYPARAM1_PCS_TXDEEMPH") from
> Linus' tree and commit ea2fdf842365 ("usb: phy: samsung: remove old
> common USB PHY code") from the usb-gadget tree.
>
> I fixed it up (the latter just removed the file, so I did that) and can
> carry the fix as necessary (no action is required).
Thank you. Guess I'll just merge current -rc in my next branch :-)
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Felipe Balbi <balbi@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Felipe Balbi <balbi@ti.com>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Jingoo Han <jg1.han@samsung.com>
Subject: Re: linux-next: manual merge of the usb-gadget tree with Linus' tree
Date: Mon, 8 Sep 2014 08:28:14 -0500 [thread overview]
Message-ID: <20140908132814.GD22409@saruman.home> (raw)
In-Reply-To: <20140908171311.414b05d2@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 636 bytes --]
On Mon, Sep 08, 2014 at 05:13:11PM +1000, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/phy/phy-samsung-usb.h between commit bbc66e140bab ("usb:
> phy: samsung: Fix wrong bit mask for PHYPARAM1_PCS_TXDEEMPH") from
> Linus' tree and commit ea2fdf842365 ("usb: phy: samsung: remove old
> common USB PHY code") from the usb-gadget tree.
>
> I fixed it up (the latter just removed the file, so I did that) and can
> carry the fix as necessary (no action is required).
Thank you. Guess I'll just merge current -rc in my next branch :-)
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-09-08 13:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-08 7:13 linux-next: manual merge of the usb-gadget tree with Linus' tree Stephen Rothwell
2014-09-08 13:28 ` Felipe Balbi [this message]
2014-09-08 13:28 ` Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2020-01-10 4:32 Stephen Rothwell
2020-01-14 8:41 ` Geert Uytterhoeven
2020-01-14 9:17 ` Pawel Laszczak
2020-01-15 3:40 ` Stephen Rothwell
2020-01-15 6:56 ` Felipe Balbi
2017-06-13 6:11 Stephen Rothwell
2014-09-08 7:06 Stephen Rothwell
2014-07-17 6:52 Stephen Rothwell
2014-07-17 15:05 ` Felipe Balbi
2014-07-17 15:05 ` Felipe Balbi
2013-08-01 5:32 Stephen Rothwell
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=20140908132814.GD22409@saruman.home \
--to=balbi@ti.com \
--cc=b.zolnierkie@samsung.com \
--cc=jg1.han@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.