linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: balbi@ti.com
Cc: Andrew Morton <akpm@linux-foundation.org>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Xi Wang <xi.wang@gmail.com>
Subject: Re: linux-next: manual merge of the akpm tree with the usb-gadget tree
Date: Tue, 19 Mar 2013 18:39:46 +1100	[thread overview]
Message-ID: <20130319183946.cbec2469b421909f8a5d7695@canb.auug.org.au> (raw)
In-Reply-To: <20130319063334.GA16715@arwen.pp.htv.fi>

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

Hi Felipe,

On Tue, 19 Mar 2013 08:33:34 +0200 Felipe Balbi <balbi@ti.com> wrote:
>
> On Tue, Mar 19, 2013 at 02:39:22PM +1100, Stephen Rothwell wrote:
> > 
> > Today's linux-next merge of the akpm tree got a conflict in
> > drivers/usb/gadget/amd5536udc.c between commit 6c39d90393a2 ("usb:
> > gadget: amd5536udc: remove unnecessary initializations") from the  tree
> 
> Looks like there's a small bug in your scripts: "from the  tree" misses
> "usb-gadget".

Yeah, that's one of the bits I have to fill in manually and sometimes I
forget - at least this time I got the Subject right.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

      reply	other threads:[~2013-03-19  7:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-19  3:39 linux-next: manual merge of the akpm tree with the usb-gadget tree Stephen Rothwell
2013-03-19  6:33 ` Felipe Balbi
2013-03-19  7:39   ` Stephen Rothwell [this message]

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=20130319183946.cbec2469b421909f8a5d7695@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=balbi@ti.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=xi.wang@gmail.com \
    /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).