diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2019-11-15 13:17:39 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2019-11-15 13:17:39 +0200 |
| commit | e205ceeb253723f4e4bdce619844ed678ae48276 (patch) | |
| tree | b6f5e3b21f915320a86733504faf8206569b8057 /net/dsa/dsa2.c | |
| parent | 1cdc2330e8d396c9cbebfc75fba4c94d34f80782 (diff) | |
| parent | 17cc51390c141662748dbbc2fe98f3ed10f2e13e (diff) | |
| download | lwn-e205ceeb253723f4e4bdce619844ed678ae48276.tar.gz lwn-e205ceeb253723f4e4bdce619844ed678ae48276.zip | |
Merge drm/drm-next into drm-intel-next-queued
Backmerge to get dfce90259d74 ("Backmerge i915 security patches from
commit 'ea0b163b13ff' into drm-next") and thus 100d46bd72ec ("Merge
Intel Gen8/Gen9 graphics fixes from Jon Bloomfield.").
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'net/dsa/dsa2.c')
| -rw-r--r-- | net/dsa/dsa2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 73002022c9d8..716d265ba8ca 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -46,7 +46,7 @@ static struct dsa_switch_tree *dsa_tree_alloc(int index) dst->index = index; INIT_LIST_HEAD(&dst->list); - list_add_tail(&dsa_tree_list, &dst->list); + list_add_tail(&dst->list, &dsa_tree_list); kref_init(&dst->refcount); |