Commit Graph

1212 Commits

Author SHA1 Message Date
Alex Shi
80cd9be34a Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
	included wakeup_reason.h file of 57caa2ad5c in kernel/power/process.c
2017-10-13 23:14:45 +08:00
Greg Kroah-Hartman
69f53f5d37 Linux 4.4.92 2017-10-12 11:27:40 +02:00
Alex Shi
fb68750598 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-10-09 14:32:35 +08:00
Greg Kroah-Hartman
c030c36a88 Linux 4.4.91 2017-10-08 10:24:24 +02:00
Greg Kroah-Hartman
37c2d0d3e8 Linux 4.4.90 2017-10-05 09:41:59 +02:00
Alex Shi
a759573d34 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-10-04 12:03:25 +08:00
Greg Kroah-Hartman
10def3a677 Linux 4.4.89 2017-09-27 11:00:37 +02:00
Alex Shi
8ffabf0207 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-09-14 12:01:21 +08:00
Greg Kroah-Hartman
b52c9082f2 Linux 4.4.88 2017-09-13 14:10:05 -07:00
Alex Shi
3e63466626 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-09-08 12:02:15 +08:00
Greg Kroah-Hartman
573b59e17e Linux 4.4.87 2017-09-07 08:34:25 +02:00
Alex Shi
fb99e783cf Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-09-03 12:01:45 +08:00
Greg Kroah-Hartman
cd99a4f3f4 Linux 4.4.86 2017-09-02 07:07:05 +02:00
Amit Pundir
330dcbb078 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

Conflicts:
    drivers/android/binder.c
        Keep AOSP changes and discard LTS binder changes, since these LTS changes
        have already been merged and further refactored in AOSP tree long ago.
2017-09-01 13:59:45 +05:30
Greg Kroah-Hartman
717bd21f81 Linux 4.4.85 2017-08-30 10:19:42 +02:00
Alex Shi
0de48f949a Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-08-25 22:44:12 +08:00
Greg Kroah-Hartman
982ce2aa79 Linux 4.4.84 2017-08-24 17:02:58 -07:00
Amit Pundir
db5bc601e4 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
    fs/f2fs/super.c
        Pick changes from LTS commit 76517ed2a7
        ("f2fs: sanity check checkpoint segno and blkoff"),
        over changes from AOSP commit 0f127e451b
        ("FROMLIST: f2fs: sanity check checkpoint segno and blkoff")

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2017-08-17 14:18:51 +05:30
Greg Kroah-Hartman
425fdd287e Linux 4.4.83 2017-08-16 13:40:42 -07:00
Greg Kroah-Hartman
4e2e415f4c Linux 4.4.82 2017-08-12 19:29:34 -07:00
Greg Kroah-Hartman
2ab639c7e2 Linux 4.4.81 2017-08-11 09:22:51 -07:00
Amit Pundir
b6488ff4cb Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
        kernel/sched/sched.h
        Refactor the changes from LTS commit 62208707b4
        ("sched/cputime: Fix prev steal time accouting during CPU hotplug")
        to align with the changes from AOSP commit dee8fa1552
        ("sched: backport cpufreq hooks from 4.9-rc4").

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2017-08-11 19:28:33 +05:30
Greg Kroah-Hartman
09e69607e4 Linux 4.4.80 2017-08-06 19:20:47 -07:00
Alex Shi
3a183de93c Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-07-28 12:01:36 +08:00
Greg Kroah-Hartman
e058f63485 Linux 4.4.79 2017-07-27 15:06:26 -07:00
Linus Torvalds
8386358980 disable new gcc-7.1.1 warnings for now
commit bd664f6b3e upstream.

I made the mistake of upgrading my desktop to the new Fedora 26 that
comes with gcc-7.1.1.

There's nothing wrong per se that I've noticed, but I now have 1500
lines of warnings, mostly from the new format-truncation warning
triggering all over the tree.

We use 'snprintf()' and friends in a lot of places, and often know that
the numbers are fairly small (ie a controller index or similar), but gcc
doesn't know that, and sees an 'int', and thinks that it could be some
huge number.  And then complains when our buffers are not able to fit
the name for the ten millionth controller.

These warnings aren't necessarily bad per se, and we probably want to
look through them subsystem by subsystem, but at least during the merge
window they just mean that I can't even see if somebody is introducing
any *real* problems when I pull.

So warnings disabled for now.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-07-27 15:06:02 -07:00
Alex Shi
1aaeb498dc Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-07-22 12:02:06 +08:00
Greg Kroah-Hartman
ece78cd779 Linux 4.4.78 2017-07-21 07:45:10 +02:00
Alex Shi
16e243013b Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-07-18 14:31:54 +08:00
Greg Kroah-Hartman
9e0499d7d3 Linux 4.4.77 2017-07-15 11:58:03 +02:00
Alex Shi
2120557722 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
	arch/arm64/kernel/armv8_deprecated.c
	arch/arm64/kernel/efi.c
	arch/arm64/kernel/entry.S
	arch/arm64/kernel/head.S
	arch/arm64/kernel/hw_breakpoint.c
	arch/arm64/mm/mmu.c
	include/linux/memblock.h
	mm/memblock.c
2017-07-11 16:22:22 +08:00
Greg Kroah-Hartman
4282d39575 Linux 4.4.76 2017-07-05 14:39:21 +02:00
Gleb Fotengauer-Malinovskiy
736b342cc9 jump label: fix passing kbuild_cflags when checking for asm goto support
commit 7292ae3d5a upstream.

The latest change of asm goto support check added passing of KBUILD_CFLAGS
to compiler.  When these flags reference gcc plugins that are not built yet,
the check fails.

When one runs "make bzImage" followed by "make modules", the kernel is always
built with HAVE_JUMP_LABEL disabled, while the modules are built depending on
CONFIG_JUMP_LABEL.  If HAVE_JUMP_LABEL macro happens to be different, modules
are built with undefined references, e.g.:

ERROR: "static_key_slow_inc" [net/netfilter/xt_TEE.ko] undefined!
ERROR: "static_key_slow_dec" [net/netfilter/xt_TEE.ko] undefined!
ERROR: "static_key_slow_dec" [net/netfilter/nft_meta.ko] undefined!
ERROR: "static_key_slow_inc" [net/netfilter/nft_meta.ko] undefined!
ERROR: "nf_hooks_needed" [net/netfilter/ipvs/ip_vs.ko] undefined!
ERROR: "nf_hooks_needed" [net/ipv6/ipv6.ko] undefined!
ERROR: "static_key_count" [net/ipv6/ipv6.ko] undefined!
ERROR: "static_key_slow_inc" [net/ipv6/ipv6.ko] undefined!

This change moves the check before all these references are added
to KBUILD_CFLAGS.  This is correct because subsequent KBUILD_CFLAGS
modifications are not relevant to this check.

Reported-by: Anton V. Boyarshinov <boyarsh@altlinux.org>
Fixes: 35f860f9ba ("jump label: pass kbuild_cflags when checking for asm goto support")
Signed-off-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Acked-by: David Lin <dtwlin@google.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-07-05 14:37:21 +02:00
Greg Kroah-Hartman
6ee496d721 Linux 4.4.75 2017-06-29 12:49:08 +02:00
Greg Kroah-Hartman
22da7ca81a Linux 4.4.74 2017-06-26 07:13:24 +02:00
Greg Kroah-Hartman
1bd30958ec Linux 4.4.73 2017-06-17 06:40:54 +02:00
David Lin
1948d0afe4 jump label: pass kbuild_cflags when checking for asm goto support
[ Upstream commit 35f860f9ba ]

Some versions of ARM GCC compiler such as Android toolchain throws in a
'-fpic' flag by default.  This causes the gcc-goto check script to fail
although some config would have '-fno-pic' flag in the KBUILD_CFLAGS.

This patch passes the KBUILD_CFLAGS to the check script so that the
script does not rely on the default config from different compilers.

Link: http://lkml.kernel.org/r/20170120234329.78868-1-dtwlin@google.com
Signed-off-by: David Lin <dtwlin@google.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Michal Marek <mmarek@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-06-17 06:39:36 +02:00
Greg Kroah-Hartman
30c9187fa8 Linux 4.4.72 2017-06-14 13:43:38 +02:00
Alex Shi
be74fd2af8 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-06-08 12:11:52 +08:00
Greg Kroah-Hartman
4bbbc76964 Linux 4.4.71 2017-06-07 12:06:14 +02:00
Alex Shi
bded05d18c Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-05-26 12:03:29 +08:00
Greg Kroah-Hartman
b409ba3b05 Linux 4.4.70 2017-05-25 14:50:50 +02:00
Alex Shi
ce5b94017f Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-05-25 10:05:41 +08:00
Greg Kroah-Hartman
bb56ca2913 Linux 4.4.69 2017-05-20 14:27:22 +02:00
Alex Shi
9f3cb876f7 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-05-15 17:32:20 +08:00
Greg Kroah-Hartman
be90e26014 Linux 4.4.68 2017-05-14 13:33:15 +02:00
Greg Kroah-Hartman
dec1dc2a0e Linux 4.4.67 2017-05-08 07:46:17 +02:00
Alex Shi
b4d01daf69 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-05-04 12:01:39 +08:00
Greg Kroah-Hartman
0c49a2c16c Linux 4.4.66 2017-05-02 21:20:09 -07:00
Greg Kroah-Hartman
418b99042b Linux 4.4.65 2017-04-30 05:50:11 +02:00