diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-15 21:16:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-15 21:16:30 -0400 |
| commit | 6b6cbc1471676402565e958674523d06213b82d7 (patch) | |
| tree | a66d41d276e5eb400e27641f24f34032fe1b9275 /arch/alpha | |
| parent | ce07183282975026716107d36fd3f5f93de76668 (diff) | |
| parent | 1bf4b1268e66d9364fc6fd41f906bc01458530ac (diff) | |
| download | linux-exynos-6b6cbc1471676402565e958674523d06213b82d7.tar.gz linux-exynos-6b6cbc1471676402565e958674523d06213b82d7.tar.bz2 linux-exynos-6b6cbc1471676402565e958674523d06213b82d7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were simply overlapping changes. In the net/ipv4/route.c
case the code had simply moved around a little bit and the same fix
was made in both 'net' and 'net-next'.
In the net/sched/sch_generic.c case a fix in 'net' happened at
the same time that a new argument was added to qdisc_hash_add().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 0b961093ca5c..6d76e528ab8f 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -1290,7 +1290,7 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p) /* copy relevant bits of struct timex. */ if (copy_from_user(&txc, txc_p, offsetof(struct timex32, time)) || copy_from_user(&txc.tick, &txc_p->tick, sizeof(struct timex32) - - offsetof(struct timex32, time))) + offsetof(struct timex32, tick))) return -EFAULT; ret = do_adjtimex(&txc); |