From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752185AbbFAJQC (ORCPT ); Mon, 1 Jun 2015 05:16:02 -0400 Received: from mail-ob0-f170.google.com ([209.85.214.170]:32813 "EHLO mail-ob0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751911AbbFAJPq (ORCPT ); Mon, 1 Jun 2015 05:15:46 -0400 MIME-Version: 1.0 In-Reply-To: <20150525130747.12747385@canb.auug.org.au> References: <20150525130747.12747385@canb.auug.org.au> Date: Mon, 1 Jun 2015 11:15:45 +0200 X-Google-Sender-Auth: -GZfEZdKjbUhLT7ZtDyi5GnWtE0 Message-ID: Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree From: Geert Uytterhoeven To: Stephen Rothwell Cc: Kalle Valo , Linux-Next , "linux-kernel@vger.kernel.org" , Emmanuel Grumbach Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 25, 2015 at 5:07 AM, Stephen Rothwell 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