From: "Grumbach, Emmanuel" <emmanuel.grumbach@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
"Berg, Johannes" <johannes.berg@intel.com>
Subject: RE: linux-next: manual merge of the net-next tree with the pci tree
Date: Mon, 10 Dec 2012 06:44:45 +0000 [thread overview]
Message-ID: <0BA3FCBA62E2DC44AF3030971E174FB3018FADD5@HASMSX103.ger.corp.intel.com> (raw)
In-Reply-To: <20121210120825.49096bafd378139e98becb8d@canb.auug.org.au>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/wireless/iwlwifi/pcie/trans.c between commit b9d146e30a2d
> ("iwlwifi: collapse wrapper for pcie_capability_read_word()") from the pci
> tree and commit 7afe3705cd4e ("iwlwifi: continue clean up -
> pcie/trans.c") from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action is
> required).
>
Looks right - thanks Stephen!
---------------------------------------------------------------------
Intel Israel (74) Limited
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
next prev parent reply other threads:[~2012-12-10 6:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-10 1:08 linux-next: manual merge of the net-next tree with the pci tree Stephen Rothwell
2012-12-10 6:44 ` Grumbach, Emmanuel [this message]
2013-04-26 3:31 Stephen Rothwell
2015-12-14 0:27 Stephen Rothwell
2017-04-12 0:25 Stephen Rothwell
2017-06-21 1:54 Stephen Rothwell
2017-06-21 13:29 ` Kalle Valo
2017-06-21 13:32 ` Stephen Rothwell
2017-07-03 1:49 ` Stephen Rothwell
2018-04-03 3:14 Stephen Rothwell
2018-04-05 1:40 ` Stephen Rothwell
2019-08-23 2:35 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=0BA3FCBA62E2DC44AF3030971E174FB3018FADD5@HASMSX103.ger.corp.intel.com \
--to=emmanuel.grumbach@intel.com \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 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).