From: Marek Vasut <marex@denx.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jiri Kosina <jikos@jikos.cz>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alan Stern <stern@rowland.harvard.edu>
Subject: Re: linux-next: manual merge of the hid tree with Linus' tree
Date: Mon, 10 Sep 2012 07:49:26 +0200 [thread overview]
Message-ID: <201209100749.27199.marex@denx.de> (raw)
In-Reply-To: <20120910113359.ddc30b010fcd73f00c993d23@canb.auug.org.au>
Dear Stephen Rothwell,
> Hi Jiri,
>
> Today's linux-next merge of the hid tree got a conflict in
> drivers/hid/usbhid/hid-quirks.c between commit 67ddbb3e6568 ("HID: add
> NOGET quirk for Eaton Ellipse MAX UPS") from Linus' tree and commit
> 2843b673d034 ("HID: add quirk for Freescale i.MX28 ROM recovery") from
> the hid tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary (no action is required).
Looks obviously correct, thank you Stephen!
Best regards,
Marek Vasut
next prev parent reply other threads:[~2012-09-10 5:49 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 1:33 linux-next: manual merge of the hid tree with Linus' tree Stephen Rothwell
2012-09-10 5:49 ` Marek Vasut [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-15 1:53 Stephen Rothwell
2022-04-21 23:33 Stephen Rothwell
2015-02-24 0:00 Stephen Rothwell
2014-10-31 0:58 Stephen Rothwell
2014-03-17 2:32 Stephen Rothwell
2014-02-20 2:04 Stephen Rothwell
2014-02-20 2:03 Stephen Rothwell
2013-03-28 0:40 Stephen Rothwell
2012-06-27 1:05 Stephen Rothwell
2011-10-11 3:37 Stephen Rothwell
2011-10-11 10:52 ` Jiri Kosina
2010-11-09 1:33 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=201209100749.27199.marex@denx.de \
--to=marex@denx.de \
--cc=jikos@jikos.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=stern@rowland.harvard.edu \
/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).