Steps on the way to 5.16-rc1
Resolves conflicts in:
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I95680ac70bd89c984688d1ff3fdf6412d3da7555
Steps on the way to 5.16-rc1
Resolves conflicts in:
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.h
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic8a3f6d258cd8530850b5789290bf030924ed15e
Enable a few config options that help performance with
5.16-rc kernels.
Bug: 146449535
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I1b83a8f69ab7f9760cd3fcd162be2e6b18f0db78
Steps on the way to 5.16-rc1
Resolves conflicts in:
drivers/gpu/drm/i915/gem/i915_gem_context.c
drivers/gpu/drm/i915/gt/intel_rps.c
drivers/gpu/drm/i915/i915_trace.h
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id4d5f1398e96f280d3455cc2e2af61786959bde5
Steps on the way to 5.16-rc1
Resolves conflicts in:
drivers/gpu/drm/drm_panel_orientation_quirks.c
drivers/gpu/drm/msm/msm_gem_submit.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9c61ce473ae764ab79c2dd5923aab8886fbbcc0a
Steps on the way to 5.16-rc1
Resolves conflicts in:
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/gpu/drm/drm_panel_orientation_quirks.c
drivers/gpu/drm/i915/gem/i915_gem_ttm.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iaae62240e81569925b6bb6c11f08c07abd2ecd52
Steps on the way to 5.16-rc1.
Resolves merge conflicts in:
kernel/power/suspend.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie7497d13d654d3a430082291090b626b1bc638c2
The 5.16-rc1 kernel has changed the default to disable eBPF unprivileged
programs to run because of Intel's broken hardware which allows for
speculation leaks to happen very easily on those platforms. This is not
an issue on the majority of Android systems, and the Android networking
functionality relies on this feature, so specifically disable the
configuration option so that things continue to work properly.
Disabling a disable configuration option, ugh...
Fixes: 8a03e56b25 ("bpf: Disallow unprivileged bpf by default")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifd055add42ec1e8360c3d7823ae12567513dba19
While overriding sugov behavior, it is also necessary to know the
runqueue on which the task is going to be enqueued.
Bug: 171598214
Change-Id: I1491a2be34a6e615c5d4bc68e095647744870233
Signed-off-by: Shaleen Agrawal <shalagra@codeaurora.org>
Steps on the way to 5.16-rc1
Resolves merge conflicts in:
drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6f34ccdd38594c59146fd6b7cd25904ab83bb063
br_switchdev_mdb_notify() is conditionally compiled only when
CONFIG_NET_SWITCHDEV=y and CONFIG_BRIDGE_IGMP_SNOOPING=y. It is called
from br_mdb.c, which is conditionally compiled only when
CONFIG_BRIDGE_IGMP_SNOOPING=y.
The shim definition of br_switchdev_mdb_notify() is therefore needed for
the case where CONFIG_NET_SWITCHDEV=n, however we mistakenly put it
there for the case where CONFIG_BRIDGE_IGMP_SNOOPING=n. This results in
build failures when CONFIG_BRIDGE_IGMP_SNOOPING=y and
CONFIG_NET_SWITCHDEV=n.
To fix this, put the shim definition right next to
br_switchdev_fdb_notify(), which is properly guarded by NET_SWITCHDEV=n.
Since this is called only from br_mdb.c, we need not take any extra
safety precautions, when NET_SWITCHDEV=n and BRIDGE_IGMP_SNOOPING=n,
this shim definition will be absent but nobody will be needing it.
Fixes: 9776457c78 ("net: bridge: mdb: move all switchdev logic to br_switchdev.c")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://lore.kernel.org/r/20211029223606.3450523-1-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit ae0393500e)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic0e3c6290af073ed8b500611fe6ae3e6b5e2cce6
Steps on the way to 5.16-rc1
Resolves conflicts in:
include/net/sock.h
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I65e908f7cb0a0588b4eb37afb0ce221981d0aab5
Steps on the way to 5.16-rc1
Resolves merge conflicts with:
tools/testing/selftests/net/ioam6.sh
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2c7f5ee7cb7c5df2b757d7284e23eb5bd9851851
Building an allmodconfig kernel arm64 kernel, the following build error
shows up:
In file included from drivers/crypto/marvell/octeontx2/cn10k_cpt.c:4:
include/linux/soc/marvell/octeontx2/asm.h:38:15: error: unknown type name 'u64'
38 | static inline u64 otx2_atomic64_fetch_add(u64 incr, u64 *ptr)
| ^~~
Include linux/types.h in asm.h so the compiler knows what the type
'u64' are.
Fixes: af3826db74 ("octeontx2-pf: Use hardware register for CQE count")
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Link: https://lore.kernel.org/r/20211013135743.3826594-1-anders.roxell@linaro.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit 6312d52838)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I94a5f0cd94166d3b2d111aea52a7114b06500086
Steps on the way to 5.16-rc1.
Resolves merge conflicts in:
drivers/net/ethernet/intel/ice/ice_devlink.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I188502a1e6b84b61582bf3f5539785f8f2e7864f
This reverts commit 6b7933539f.
It causes lots of merge conflicts with upstream changes that come into
the tree in 5.16-rc1, so revert it for now. If this is really still
needed, it can come back later, ideally it should go upstream first.
Bug: 202075496
Cc: Yifan Hong <elsk@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I994ce12885e06bb984c1b8cbe3d9c5663f77bb51
