Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752105Ab0FDGPL (ORCPT ); Fri, 4 Jun 2010 02:15:11 -0400 Received: from smtp.nokia.com ([192.100.122.233]:65057 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751239Ab0FDGPJ (ORCPT ); Fri, 4 Jun 2010 02:15:09 -0400 Subject: Re: linux-next: manual merge of the wireless tree with the net tree From: Luciano Coelho To: ext Stephen Rothwell Cc: "John W. Linville" , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Oikarinen Juuso (Nokia-D/Tampere)" , Eric Dumazet , David Miller , "netdev@vger.kernel.org" In-Reply-To: <20100604114801.df31fb50.sfr@canb.auug.org.au> References: <20100604114801.df31fb50.sfr@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" Date: Fri, 04 Jun 2010 09:14:24 +0300 Message-ID: <1275632064.15894.18.camel@chilepepper> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 04 Jun 2010 06:14:27.0466 (UTC) FILETIME=[2FB2BEA0:01CB03AD] X-Nokia-AV: Clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1136 Lines: 30 On Fri, 2010-06-04 at 03:48 +0200, ext Stephen Rothwell wrote: > Hi John, > > Today's linux-next merge of the wireless tree got a conflict in > drivers/net/wireless/wl12xx/wl1271.h > drivers/net/wireless/wl12xx/wl1271_cmd.h between commit > ba2d3587912f82d1ab4367975b1df460db60fb1e ("drivers/net: use __packed > annotation") from the net tree and commit > eb70eb723b489dd4e233e22e47d993f59858cdd8 ("wl1271: Update handling of the > NVS file / INI parameters") from the wireless tree. > > I fixed up some if it (see below) and can carry the fixes as necessary. > The latter patch also moved some of the structures to another file > (drivers/net/wireless/wl12xx/wl1271_ini.h), so they will need fixing up > there. Acked-by: Luciano Coelho Thanks for the merge. I'll submit a new patch fixing the annotation from the structs that were moved. -- Cheers, Luca. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/