linux-kernel - Re: linux-next: manual merge of the net tree with Linus' tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20090518.210913.206585156.davem@davemloft.net>
Date:	Mon, 18 May 2009 21:09:13 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	sfr@...b.auug.org.au
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	vasu.dev@...el.com, jeykholt@...co.com, robert.w.love@...el.com,
	James.Bottomley@...senPartnership.com, christopher.leech@...el.com
Subject: Re: linux-next: manual merge of the net tree with Linus' tree

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 19 May 2009 13:39:58 +1000

> Today's linux-next merge of the net tree got a conflict in
> drivers/scsi/fcoe/fcoe.c between commit
> 6401bdcad536cc00589c38e7e1c140d3acc00087 ("[SCSI] fcoe: fip: add
> multicast filter to receive FIP advertisements") from Linus' tree and
> commit 184dd3459bb334d9061b58faed3610d08d6c7ff8 ("fcoe: adds spma mode
> support") from the net tree.
> 
> There is another trivial conflict between commit
> dd3fd72e692c8af007f70df4433c0cffe8582d8b ("[SCSI] fcoe: fix spelling
> typos and bad comments") from Linus' tree and commit
> ab6b85c1d7a1bf6c2b27fb542a7b2404e45b7e24 ("fcoe: consolidates netdev
> related config and cleanup for spma mode") from the net tree.
> 
> Just context changes.  I fixed them up (see below) and can carry them for
> a while.

I'll pull net-2.6 into net-next-2.6 and push the result to kernel.org
to resolve this.

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