Skip to contentSkip to conversation

linux-next: Tree for Sep 20

DISCUSSION Mark Brown 2 participants 3 messages Sep 20, 2019 Linux-next tree

lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

Hi all,

News: There will likely be no more -next builds until Stephen returns on the 30th, I *may* do some next week but it's more likely that I won't and it certainly won't be every day.

Changes since 20190919:

The thermal tree gained a conflict with Linus' tree which I fixed up.

The akpm-current tree gained a conflict with the risc-v-fixes tree which I fixed up.

Non-merge commits (relative to Linus' tree): 2719

 2712 files changed, 92075 insertions(+), 40381 deletions(-)

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master.

You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a defconfig for arm64, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf.

Below is a summary of the state of the merge.

I am currently merging 311 trees (counting Linus' and 77 trees of bug fix patches pending for the current merge release).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds.

Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes.

#1 lore raw

Re: linux-next: Tree for Sep 20 (amd/display)

Quoted 8 lines · Mark Brown

Hi all,

News: There will likely be no more -next builds until Stephen returns on the 30th, I *may* do some next week but it's more likely that I won't and it certainly won't be every day.

Changes since 20190919:

on i386:

ld: drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.o: in function `dce11_pplib_apply_display_requirements':
dce110_clk_mgr.c:(.text+0x2f0): undefined reference to `__divdi3'
ld: dce110_clk_mgr.c:(.text+0x304): undefined reference to `__divdi3'

Signature · 1 line
~Randy
#2 lore raw

Re: linux-next: Tree for Sep 20 (amdgpu-2)

In reply to Mark Brown
Quoted 8 lines · Mark Brown

Hi all,

News: There will likely be no more -next builds until Stephen returns on the 30th, I *may* do some next week but it's more likely that I won't and it certainly won't be every day.

Changes since 20190919:

on x86_64:

(1) where is function get_wm_urgent() defined? I cannot find it (i.e., grep cannot find it).

../drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_resource.c: In function ‘calculate_wm_set_for_vlevel’:
../drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_resource.c:964:22: error: SSE register return with SSE disabled

  wm_set->urgent_ns = get_wm_urgent(dml, pipes, pipe_cnt) * 1000;
                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

(2) drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_resource.c needs #include <linux/slab.h>
for the kzalloc() and kfree() function calls.

Thanks.

Signature · 1 line
~Randy