diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-02-23 00:24:56 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-02-23 00:29:26 +0100 |
| commit | fecc51559a844b7f74119159c3cdb25b80b4e2c6 (patch) | |
| tree | 2cf1e49810eb0c58e552f722cc2ab2742e62cf43 /drivers/gpu/drm/nouveau/nouveau_exec.c | |
| parent | Merge tag 'wireless-next-2024-02-22' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | Merge tag 'net-6.8.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ne... (diff) | |
| download | linux-fecc51559a844b7f74119159c3cdb25b80b4e2c6.tar.xz linux-fecc51559a844b7f74119159c3cdb25b80b4e2c6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
net/ipv4/udp.c
f796feabb9f5 ("udp: add local "peek offset enabled" flag")
56667da7399e ("net: implement lockless setsockopt(SO_PEEK_OFF)")
Adjacent changes:
net/unix/garbage.c
aa82ac51d633 ("af_unix: Drop oob_skb ref before purging queue in GC.")
11498715f266 ("af_unix: Remove io_uring code for GC.")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_exec.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_exec.c b/drivers/gpu/drm/nouveau/nouveau_exec.c index bc5d71b79ab2..e65c0ef23bc7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_exec.c +++ b/drivers/gpu/drm/nouveau/nouveau_exec.c @@ -389,7 +389,7 @@ nouveau_exec_ioctl_exec(struct drm_device *dev, if (ret) goto out; - args.sched = &chan16->sched; + args.sched = chan16->sched; args.file_priv = file_priv; args.chan = chan; |