Date: Sun, 11 Nov 2012 23:07:25 +0100
From: Francois Romieu <romieu@fr.zoreil.com>
To: Dayanidhi Sreenivasan <dayanidhi.sreenivasan@gmail.com>
Cc: nic_swsd@realtek.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        Hayes Wang <hayeswang@realtek.com>
Subject: Re: [PATCH 1/1] r8169: Removed unused macros from r8169.c
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
Content-Disposition: inline
In-Reply-To: <1352652518-2287-1-git-send-email-dayanidhi.sreenivasan@gmail.com>
User-Agent: Mutt/1.4.2.2i
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 621
Lines: 19

Dayanidhi Sreenivasan <dayanidhi.sreenivasan@gmail.com> :
[...]

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
--
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/