linux-kernel - Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAMuHMdXUeqnq1_bSSr_GnwvO1iNM2ceKp5BhME6LA3Wvt3-tgQ@mail.gmail.com>
Date:	Mon, 1 Jun 2015 11:15:45 +0200
From:	Geert Uytterhoeven <geert@...ux-m68k.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Kalle Valo <kvalo@...eaurora.org>,
	Linux-Next <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Emmanuel Grumbach <emmanuel.grumbach@...el.com>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with
 the wireless-drivers tree

On Mon, May 25, 2015 at 5:07 AM, Stephen Rothwell <sfr@...b.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@...b.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@...ux-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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/