linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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,
	Michal Nazarewicz <mina86@mina86.com>,
	Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Subject: Re: linux-next: manual merge of the usb-gadget tree with Linus' tree
Date: Thu, 17 Jul 2014 10:05:19 -0500	[thread overview]
Message-ID: <20140717150514.GG10459@saruman.home> (raw)
In-Reply-To: <20140717165238.2e056cba@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

On Thu, Jul 17, 2014 at 04:52:38PM +1000, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> include/uapi/linux/usb/functionfs.h between commit 091221417853 ("usb:
> gadget: f_fs: resurect usb_functionfs_descs_head structure") from
> Linus' tree and commit f0175ab51993 ("usb: gadget: f_fs: OS descriptors
> support") from the usb-gadget tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks that is the correct fix :-)

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

  reply	other threads:[~2014-07-17 15:05 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-17  6:52 linux-next: manual merge of the usb-gadget tree with Linus' tree Stephen Rothwell
2014-07-17 15:05 ` Felipe Balbi [this message]
  -- 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:13 Stephen Rothwell
2014-09-08 13:28 ` Felipe Balbi
2014-09-08  7:06 Stephen Rothwell
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=20140717150514.GG10459@saruman.home \
    --to=balbi@ti.com \
    --cc=andrzej.p@samsung.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mina86@mina86.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).