linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: "Fabio Porcedda" <fabio.porcedda@gmail.com>,
	"Bjørn Mork" <bjorn@mork.no>,
	"David S. Miller" <davem@davemloft.net>,
	"Enrico Mioso" <mrkiko.rs@gmail.com>,
	"Antonella Pellizzari" <anto.pellizzari83@gmail.com>
Cc: Thierry Reding <thierry.reding@gmail.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the net-next tree
Date: Fri, 18 Oct 2013 14:05:02 +0100	[thread overview]
Message-ID: <20131018130502.GM2443@sirena.org.uk> (raw)

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

Today's linux-next merge of the next-next tree got a conflict in
drivers/net/usb/qmi_wwan.c between ce97fef4 (net: qmi_wwan: Olivetti
Olicard 200 support) in the net tree and 905468fa (net: qmi_wwan: add
Telit LE920 newer firmware support) in the net-next tree.

I've fixed up as below and can carry.

diff --cc drivers/net/usb/qmi_wwan.c
index 818ce90,d03b6b6..0000000
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@@ -714,7 -729,7 +729,8 @@@ static const struct usb_device_id produ
  	{QMI_FIXED_INTF(0x2357, 0x0201, 4)},	/* TP-LINK HSUPA Modem MA180 */
  	{QMI_FIXED_INTF(0x2357, 0x9000, 4)},	/* TP-LINK MA260 */
  	{QMI_FIXED_INTF(0x1bc7, 0x1200, 5)},	/* Telit LE920 */
+ 	{QMI_FIXED_INTF(0x1bc7, 0x1201, 2)},	/* Telit LE920 */
 +	{QMI_FIXED_INTF(0x0b3c, 0xc005, 6)},    /* Olivetti Olicard 200 */
  	{QMI_FIXED_INTF(0x1e2d, 0x0060, 4)},	/* Cinterion PLxx */
  
  	/* 4. Gobi 1000 devices */

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

             reply	other threads:[~2013-10-18 13:05 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-18 13:05 Mark Brown [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-10-21 15:36 linux-next: Tree for Oct 21 Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-18 12:58 Mark Brown
2013-10-18 13:08 ` Neil Horman
2013-10-18 14:39 ` Vlad Yasevich
2013-10-08 13:44 linux-next: Tree for Oct 8 Thierry Reding
2013-10-08 13:44 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
2013-09-30 11:26 ` linux-next: manual merge of the net-next tree Thierry Reding

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=20131018130502.GM2443@sirena.org.uk \
    --to=broonie@kernel.org \
    --cc=anto.pellizzari83@gmail.com \
    --cc=bjorn@mork.no \
    --cc=davem@davemloft.net \
    --cc=fabio.porcedda@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mrkiko.rs@gmail.com \
    --cc=thierry.reding@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).