linux-kernel - 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-next>] [day] [month] [year] [list]

Message-Id: <20101227104144.cedc2d63.sfr@canb.auug.org.au>
Date:	Mon, 27 Dec 2010 10:41:44 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Changli Gao <xiaosuo@...il.com>
Subject: linux-next: manual merge of the net tree with Linus' tree

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/ipv4/fib_frontend.c between commit
e058464990c2ef1f3ecd6b83a154913c3c06f02a ("Revert "ipv4: Allow
configuring subnets as local addresses"") from Linus' tree and commit
5811662b15db018c740c57d037523683fd3e6123 ("net: use the macros defined
for the members of flowi") from the net tree.

Just context changes (I think).  I fixed it up (see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc net/ipv4/fib_frontend.c
index c19c1f7,9f8bb68..0000000
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@@ -158,11 -158,8 +158,7 @@@ static void fib_flush(struct net *net
  struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref)
  {
  	struct flowi fl = {
- 		.nl_u = {
- 			.ip4_u = {
- 				.daddr = addr
- 			}
- 		},
+ 		.fl4_dst = addr,
 -		.flags = FLOWI_FLAG_MATCH_ANY_IIF
  	};
  	struct fib_result res = { 0 };
  	struct net_device *dev = NULL;
--
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/