From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "John W. Linville" <linville@tuxdriver•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Greg Rose <gregory.v.rose@intel•com>,
Jeff Kirsher <jeffrey.t.kirsher@intel•com>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org, Johannes Berg <johannes.berg@intel•com>
Subject: linux-next: manual merge of the wireless tree with the net tree
Date: Thu, 23 Jun 2011 12:47:55 +1000 [thread overview]
Message-ID: <20110623124755.f4e1a7e1.sfr@canb.auug.org.au> (raw)
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
include/linux/netlink.h between commit c7ac8679bec9 ("rtnetlink: Compute
and store minimum ifinfo dump size") from the net tree and commit
670dc2833d14 ("netlink: advertise incomplete dumps") from the wireless
tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc include/linux/netlink.h
index fdd0188,8d1bcec..0000000
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@@ -221,8 -221,8 +222,9 @@@ struct netlink_callback
int (*dump)(struct sk_buff * skb,
struct netlink_callback *cb);
int (*done)(struct netlink_callback *cb);
- int family;
+ u16 family;
+ u16 min_dump_alloc;
+ unsigned int prev_seq, seq;
long args[6];
};
next reply other threads:[~2011-06-23 2:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-23 2:47 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-19 0:59 linux-next: manual merge of the wireless tree with the net tree Stephen Rothwell
2011-08-19 1:03 ` John W. Linville
2011-05-19 1:02 Stephen Rothwell
2010-07-21 2:04 Stephen Rothwell
2010-07-09 1:51 Stephen Rothwell
2010-07-09 9:59 ` Luciano Coelho
2010-06-23 2:51 Stephen Rothwell
2010-06-04 1:48 Stephen Rothwell
2010-06-04 6:14 ` Luciano Coelho
2010-04-12 4:05 Stephen Rothwell
2010-02-16 1:01 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110623124755.f4e1a7e1.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=gregory.v.rose@intel$(echo .)com \
--cc=jeffrey.t.kirsher@intel$(echo .)com \
--cc=johannes.berg@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox