From mboxrd@z Thu Jan 1 00:00:00 1970 From: Francois Romieu Subject: Re: [PATCH 1/1] r8169: Removed unused macros from r8169.c Date: Sun, 11 Nov 2012 23:07:25 +0100 Message-ID: <20121111220725.GA873@electric-eye.fr.zoreil.com> References: <1352652518-2287-1-git-send-email-dayanidhi.sreenivasan@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: nic_swsd@realtek.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hayes Wang To: Dayanidhi Sreenivasan Return-path: Content-Disposition: inline In-Reply-To: <1352652518-2287-1-git-send-email-dayanidhi.sreenivasan@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Dayanidhi Sreenivasan : [...] I have fixed the conflict with the driver in net-next due to removal of the SafeMtu #define and pushed the result in branch davem-next.r8169 at git://violet.fr.zoreil.com/romieu/linux Next time you send a patch, please specify the branch it should apply to and check it does not conflict. Thanks. -- Ueimor