linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Luciano Coelho <luciano.coelho@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Kalle Valo <kvalo@codeaurora.org>,
	Wireless <linux-wireless@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Shahar S Matityahu <shahar.s.matityahu@intel.com>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree
Date: Tue, 30 Apr 2019 08:30:32 +0300	[thread overview]
Message-ID: <bad0f559fdd6eb83c9354ee473c1d7377e83b4d9.camel@intel.com> (raw)
In-Reply-To: <20190430140831.6095243c@canb.auug.org.au>

On Tue, 2019-04-30 at 14:08 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
> 
>   drivers/net/wireless/intel/iwlwifi/fw/file.h
> 
> between commit:
> 
>   b35f63972c5c ("iwlwifi: dbg_ini: check debug TLV type explicitly")
> 
> from the wireless-drivers tree and commit:
> 
>   aee1b6385e29 ("iwlwifi: support fseq tlv and print fseq version")
> 
> from the wireless-drivers-next tree.
> 
> I fixed it up (the latter is a superset of the former) and can carry the
> fix as necessary. This is now fixed as far as linux-next is concerned,
> but any non trivial conflicts should be mentioned to your upstream
> maintainer when your tree is submitted for merging.  You may also want
> to consider cooperating with the maintainer of the conflicting tree to
> minimise any particularly complex conflicts.

Thanks, Stephen!

Your resolution is correct, thanks.  I accidentally included the block
that was already in b35f63972c5c when I rebased aee1b6385e29, but it's
harmless (except for the minimal conflict it causes).

--
Cheers,
Luca.

  reply	other threads:[~2019-04-30  5:30 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-30  4:08 linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree Stephen Rothwell
2019-04-30  5:30 ` Luciano Coelho [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-03-24  0:16 Stephen Rothwell
2020-03-24  7:00 ` Kalle Valo
2020-03-24  7:29   ` Luca Coelho
2020-03-24  8:07     ` Kalle Valo
2019-10-31  0:13 Stephen Rothwell
2019-10-31  9:36 ` Kalle Valo
2019-04-15  2:08 Stephen Rothwell
     [not found] ` <20190415120853.39e0e46a-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2019-04-18 13:49   ` Kalle Valo
2019-04-15  2:01 Stephen Rothwell
2019-04-18 13:49 ` Kalle Valo
2018-04-26  1:09 Stephen Rothwell
     [not found] ` <20180426110917.446204af-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2018-04-26  7:38   ` Luciano Coelho
2018-04-26 10:33     ` Kalle Valo
2018-04-26 11:51       ` Luciano Coelho
2017-12-08  1:00 Stephen Rothwell
2017-12-08 12:30 ` Kalle Valo
2017-10-12 17:25 Mark Brown
2017-10-12 18:16 ` Luciano Coelho
2017-10-12 18:21   ` Mark Brown
2017-10-12 18:27     ` Luciano Coelho
2017-10-12 18:35       ` Mark Brown
2017-10-12 18:50         ` Luca Coelho
2017-10-12 18:59           ` Mark Brown
2017-10-12 19:02             ` Luca Coelho
2017-10-12 18:29 ` Luca Coelho
2017-10-12 19:12   ` Mark Brown
2017-10-12 17:20 Mark Brown
2017-10-12 17:14 Mark Brown
2015-05-25  3:07 Stephen Rothwell
2015-06-01  9:15 ` Geert Uytterhoeven
2015-01-16  4:20 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=bad0f559fdd6eb83c9354ee473c1d7377e83b4d9.camel@intel.com \
    --to=luciano.coelho@intel.com \
    --cc=kvalo@codeaurora.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=shahar.s.matityahu@intel.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).