All of lore.kernel.org
 help / color / mirror / Atom feed
From: Samuel Ortiz <sameo@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	"John W. Linville" <linville@tuxdriver.com>
Cc: David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the net-next tree with the wireless tree
Date: Tue, 2 Apr 2013 11:30:38 +0200	[thread overview]
Message-ID: <20130402093038.GF17363@zurbaran> (raw)
In-Reply-To: <20130402130044.ddacc1c990698bd416e4c808@canb.auug.org.au>

Hi John, Stephen,

On Tue, Apr 02, 2013 at 01:00:44PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/nfc/microread/mei.c between commit 9593b0b1179c ("NFC: microread:
> Fix build failure due to a new MEI bus API") from the wireless tree and
> commit 63cd353c34a0 ("NFC: microread: Fix MEI build failure") from the
> net-next tree.
John, sorry for the conflict.

I sent a patch to John for wireless-next that will fix it once it
ends up in net-next.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

  reply	other threads:[~2013-04-02  9:30 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-02  2:00 linux-next: manual merge of the net-next tree with the wireless tree Stephen Rothwell
2013-04-02  2:00 ` Stephen Rothwell
2013-04-02  9:30 ` Samuel Ortiz [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-10-24  0:24 Stephen Rothwell
2023-10-12  0:37 Stephen Rothwell
2023-10-12  8:10 ` Johannes Berg
2023-10-19 21:40   ` Jakub Kicinski
2023-10-20  5:49     ` Johannes Berg
2014-07-24  2:47 Stephen Rothwell
2014-07-24  2:47 ` Stephen Rothwell
2014-07-23  2:00 Stephen Rothwell
2014-07-23  2:00 ` Stephen Rothwell
2014-05-23  3:45 Stephen Rothwell
2014-05-23  3:45 ` Stephen Rothwell
2014-02-26  3:21 Stephen Rothwell
2014-02-26  3:21 ` Stephen Rothwell
2014-02-21  2:34 Stephen Rothwell
2014-02-21  2:34 ` Stephen Rothwell
2013-09-27  3:03 Stephen Rothwell
2013-09-27  3:03 ` Stephen Rothwell
2013-08-27  4:10 Stephen Rothwell
2013-08-27  4:10 ` Stephen Rothwell
2013-04-04  0:44 Stephen Rothwell
2013-04-04  0:44 ` Stephen Rothwell
2013-05-02  3:19 ` Stephen Rothwell
2013-05-02  3:19   ` Stephen Rothwell
2013-03-26  0:51 Stephen Rothwell
2013-03-26  0:51 ` Stephen Rothwell
2013-03-26  0:48 Stephen Rothwell
2013-03-26  0:48 ` Stephen Rothwell
2012-07-03  1:44 Stephen Rothwell
2012-07-03  1:44 ` Stephen Rothwell
2012-07-03  2:33 ` John W. Linville
2012-06-14  3:12 Stephen Rothwell
2012-06-14  3:12 ` Stephen Rothwell
2012-06-14  4:50 ` Mohammed Shafi Shajakhan
2012-06-14  4:50   ` Mohammed Shafi Shajakhan
2012-06-14 12:59   ` John W. Linville
2012-05-04  3:21 Stephen Rothwell
2012-05-04  3:21 ` Stephen Rothwell
2012-05-04  4:35 ` Guy, Wey-Yi
2012-02-16  1:40 Stephen Rothwell
2012-02-16  1:40 ` Stephen Rothwell
2012-02-16  1:37 Stephen Rothwell
2012-02-16  1:37 ` Stephen Rothwell
2011-12-20  2:02 Stephen Rothwell
2011-12-20  2:02 ` Stephen Rothwell
2011-12-15  2:53 Stephen Rothwell
2011-12-15  2:53 ` Stephen Rothwell
2011-12-15  3:16 ` Stephen Rothwell
2011-12-15  3:16   ` 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=20130402093038.GF17363@zurbaran \
    --to=sameo@linux.intel.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=netdev@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.