Return-path: Received: from cantor.suse.de ([195.135.220.2]:44182 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754028AbXKEVRF (ORCPT ); Mon, 5 Nov 2007 16:17:05 -0500 From: Andreas Schwab To: Larry Finger Cc: "John W. Linville" , wireless Subject: Re: Problem with wireless-2.6 References: <472F57A6.3020107@lwfinger.net> <20071105182825.GA3478@tuxdriver.com> <472F85A6.90603@lwfinger.net> Date: Mon, 05 Nov 2007 22:17:03 +0100 In-Reply-To: <472F85A6.90603@lwfinger.net> (Larry Finger's message of "Mon\, 05 Nov 2007 15\:05\:42 -0600") Message-ID: (sfid-20071105_211713_848592_8196727F) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: Larry Finger writes: >>From other comments, I think I needed a git rebase command. I don't think so. Do you have set branch.autosetupmerge to false? Andreas. --=20 Andreas Schwab, SuSE Labs, schwab@suse.de SuSE Linux Products GmbH, Maxfeldstra=DFe 5, 90409 N=FCrnberg, Germany PGP key fingerprint =3D 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4= ED5 "And now for something completely different." - To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html