linux-kernel - Re: linux-next: manual merge of the net-next tree with the arm-soc tree

Open Source and information security mailing list archives

Message-ID: <20120104044620.GL2414@b20223-02.ap.freescale.net>
Date:	Wed, 4 Jan 2012 12:46:21 +0800
From:	Richard Zhao <richard.zhao@...escale.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Arnd Bergmann <arnd@...db.de>, <linux-kernel@...r.kernel.org>,
	<linux-next@...r.kernel.org>, Olof Johansson <olof@...om.net>,
	Richard Zhao <richard.zhao@...aro.org>,
	<linux-arm-kernel@...ts.infradead.org>,
	Lothar Waßmann <LW@...O-electronics.de>
Subject: Re: linux-next: manual merge of the net-next tree with the arm-soc
 tree

On Wed, Jan 04, 2012 at 03:06:58PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/freescale/fec.c between commit 0ebafefcaa7a ("net:
> fec: add clk_prepare/clk_unprepare") from the arm-soc tree and commit
> e163cc97f9ac ("net/fec: fix the .remove code") from the net-next tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.
It's good. 

Thanks
Richard
> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
> 
> diff --cc drivers/net/ethernet/freescale/fec.c
> index 112af9b,b0b0445..0000000
> --- a/drivers/net/ethernet/freescale/fec.c
> +++ b/drivers/net/ethernet/freescale/fec.c
> @@@ -1638,13 -1657,18 +1657,18 @@@ fec_drv_remove(struct platform_device *
>   	struct net_device *ndev = platform_get_drvdata(pdev);
>   	struct fec_enet_private *fep = netdev_priv(ndev);
>   	struct resource *r;
> + 	int i;
>   
> - 	fec_stop(ndev);
> + 	unregister_netdev(ndev);
>   	fec_enet_mii_remove(fep);
> + 	for (i = 0; i < FEC_IRQ_NUM; i++) {
> + 		int irq = platform_get_irq(pdev, i);
> + 		if (irq > 0)
> + 			free_irq(irq, ndev);
> + 	}
>  -	clk_disable(fep->clk);
>  +	clk_disable_unprepare(fep->clk);
>   	clk_put(fep->clk);
>   	iounmap(fep->hwp);
> - 	unregister_netdev(ndev);
>   	free_netdev(ndev);
>   
>   	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);


> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@...ts.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives