All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
To: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Cc: Wireless <linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	Linux Next Mailing List
	<linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	Linux Kernel Mailing List
	<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	Ihab Zhaika <ihab.zhaika-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>,
	Luca Coelho
	<luciano.coelho-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree
Date: Thu, 18 Apr 2019 16:49:24 +0300	[thread overview]
Message-ID: <87k1fr2zkr.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <20190415120853.39e0e46a-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> (Stephen Rothwell's message of "Mon, 15 Apr 2019 12:08:53 +1000")

Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> writes:

> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
>   drivers/net/wireless/intel/iwlwifi/pcie/drv.c
>
> between commits:
>
>   0d5bad14226a ("iwlwifi: rename structs to fit the new names")
>   972d8e137779 ("iwlwifi: add new 0x2723/0x2080 card for 22000")
>
> from the wireless-drivers tree and commit:
>
>   ef8a913766cd ("iwlwifi: remove misconfigured pci ids from 22260 series")
>
> from the wireless-drivers-next tree.
>
> I fixed it up (see below) 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, I'll let Dave know about this when he pulls w-d-next.

-- 
Kalle Valo

WARNING: multiple messages have this Message-ID (diff)
From: Kalle Valo <kvalo@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Wireless <linux-wireless@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Ihab Zhaika <ihab.zhaika@intel.com>,
	Luca Coelho <luciano.coelho@intel.com>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree
Date: Thu, 18 Apr 2019 16:49:24 +0300	[thread overview]
Message-ID: <87k1fr2zkr.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <20190415120853.39e0e46a@canb.auug.org.au> (Stephen Rothwell's message of "Mon, 15 Apr 2019 12:08:53 +1000")

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
>   drivers/net/wireless/intel/iwlwifi/pcie/drv.c
>
> between commits:
>
>   0d5bad14226a ("iwlwifi: rename structs to fit the new names")
>   972d8e137779 ("iwlwifi: add new 0x2723/0x2080 card for 22000")
>
> from the wireless-drivers tree and commit:
>
>   ef8a913766cd ("iwlwifi: remove misconfigured pci ids from 22260 series")
>
> from the wireless-drivers-next tree.
>
> I fixed it up (see below) 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, I'll let Dave know about this when he pulls w-d-next.

-- 
Kalle Valo

  parent reply	other threads:[~2019-04-18 13:49 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-15  2:08 linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree Stephen Rothwell
     [not found] ` <20190415120853.39e0e46a-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2019-04-18 13:49   ` Kalle Valo [this message]
2019-04-18 13:49     ` Kalle Valo
  -- 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-30  4:08 Stephen Rothwell
2019-04-30  4:08 ` Stephen Rothwell
2019-04-30  5:30 ` Luciano Coelho
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  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=87k1fr2zkr.fsf@kamboji.qca.qualcomm.com \
    --to=kvalo-sgv2jx0feol9jmxxk+q4oq@public.gmane.org \
    --cc=ihab.zhaika-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=luciano.coelho-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
    --cc=sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org \
    /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.