diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-07-01 08:49:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-07-01 09:31:25 +0200 |
| commit | 0a54cec0c25cc49e3b68b14c205f1f6cff13f5e1 (patch) | |
| tree | eb4e63ee9ae1fcaf9aa53a1668e55c09516052d9 /net/sched/sch_teql.c | |
| parent | ec8c27e04f89a7575ca2c4facb99152e03d6a99c (diff) | |
| parent | 980019d74e4b2428362b36a0506519d6d9460800 (diff) | |
Merge branch 'linus' into core/rcu
Conflicts:
fs/fs-writeback.c
Merge reason: Resolve the conflict
Note, i picked the version from Linus's tree, which effectively reverts
the fs-writeback.c bits of:
b97181f: fs: remove all rcu head initializations, except on_stack initializations
As the upstream changes to this file changed this code heavily and the
first attempt to resolve the conflict resulted in a non-booting kernel.
It's safer to re-try this portion of the commit cleanly.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/sched/sch_teql.c')
| -rw-r--r-- | net/sched/sch_teql.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 3415b6ce1c0a..807643bdcbac 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c @@ -449,6 +449,7 @@ static __init void teql_master_setup(struct net_device *dev) dev->tx_queue_len = 100; dev->flags = IFF_NOARP; dev->hard_header_len = LL_MAX_HEADER; + dev->priv_flags &= ~IFF_XMIT_DST_RELEASE; } static LIST_HEAD(master_dev_list); |