All of lore.kernel.org
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kalle Valo <kvalo@codeaurora.org>,
	Linux-Next <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree
Date: Mon, 1 Jun 2015 11:15:45 +0200	[thread overview]
Message-ID: <CAMuHMdXUeqnq1_bSSr_GnwvO1iNM2ceKp5BhME6LA3Wvt3-tgQ@mail.gmail.com> (raw)
In-Reply-To: <20150525130747.12747385@canb.auug.org.au>

On Mon, May 25, 2015 at 5:07 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in drivers/net/wireless/iwlwifi/Kconfig between commit
> ed65918735a5 ("iwlwifi: 7000: modify the firmware name for 3165") from
> the wireless-drivers tree and commit 87411456834a ("iwlwifi: clarify
> the device / firmware mapping in Kconfig") from the
> wireless-drivers-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
>
> diff --cc drivers/net/wireless/iwlwifi/Kconfig
> index f89f446e5c8a,99f9760fc11e..000000000000
> --- a/drivers/net/wireless/iwlwifi/Kconfig
> +++ b/drivers/net/wireless/iwlwifi/Kconfig
> @@@ -21,7 -21,7 +21,8 @@@ config IWLWIF
>                 Intel 7260 Wi-Fi Adapter
>                 Intel 3160 Wi-Fi Adapter
>                 Intel 7265 Wi-Fi Adapter
>  +              Intel 3165 Wi-Fi Adapter
> +               Intel 8260 Wi-Fi Adapter

Sorting would be nice...

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

  reply	other threads:[~2015-06-01  9:16 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-25  3:07 linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree Stephen Rothwell
2015-06-01  9:15 ` Geert Uytterhoeven [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-30  4:08 Stephen Rothwell
2019-04-30  4:08 ` Stephen Rothwell
2019-04-30  5:30 ` Luciano Coelho
2019-04-15  2:08 Stephen Rothwell
2019-04-18 13:49 ` Kalle Valo
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
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-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=CAMuHMdXUeqnq1_bSSr_GnwvO1iNM2ceKp5BhME6LA3Wvt3-tgQ@mail.gmail.com \
    --to=geert@linux-m68k.org \
    --cc=emmanuel.grumbach@intel.com \
    --cc=kvalo@codeaurora.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@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.