linux-next: Tree for Jun 11
Hi all,
News: The merge window has opened, so please do *not* add v5.9 material
to your linux-next included branches until after v5.8-rc1 has been
released.
Changes since 20200610:
My fixes tree contains:
4cb4bfffe2c1 ("device_cgroup: Fix RCU list debugging warning")
The tip tree gained conflicts against Linus' tree.
Non-merge commits (relative to Linus' tree): 1531
2039 files changed, 256836 insertions(+), 24595 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 ppc64_defconfig for powerpc, an allmodconfig for x86_64, a
multi_v7_defconfig for arm and a native build of tools/perf. After
the final fixups (if any), I do an x86_64 modules_install followed by
builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit),
ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc
and sparc64 defconfig and htmldocs. And finally, a simple boot test
of the powerpc pseries_le_defconfig kernel in qemu (with and without
kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 324 trees (counting Linus' and 82 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.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (79ca035d2d94 Merge branch 'proc-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
Merging fixes/master (df8cb0ea9423 device_cgroup: Fix RCU list debugging
warning)
Merging kbuild-current/fixes (57755ccdf246 kbuild: make module name conflict a
warning again)
Merging arc-current/for-curr (9d9368e839c2 ARC: [arcompact] fix bitrot with 2
levels of interrupt)
Merging arm-current/fixes (3866f217aaa8 ARM: 8977/1: ptrace: Fix mask for thumb
breakpoint hook)
Merging arm-soc-fixes/arm/fixes (99706d62fb50 Merge tag
'omap-for-v5.7/cpsw-fixes-signed' of
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes)
Merging uniphier-fixes/fixes (0e698dfa2822 Linux 5.7-rc4)
Merging arm64-fixes/for-next/fixes (ba051f097fc3 arm64/kernel: Fix return value
when cpu_online() fails in __cpu_up())
Merging m68k-current/for-linus (3381df095419 m68k: tools: Replace zero-length
array with flexible-array member)
Merging powerpc-fixes/fixes (2f26ed1764b4 powerpc/64s: Disable sanitisers for C
syscall/interrupt entry/exit code)
Merging s390-fixes/fixes (3d77e6a8804a Linux 5.7)
Merging sparc/master (af7b4801030c Merge
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty
inodes after removing key)
Merging net/master (5969856ae8ce mptcp: fix races between shutdown and recvmsg)
CONFLICT (content): Merge conflict in net/ipv4/tcp.c
Merging bpf/master (47f6bc4ce1ff tools, bpf: Do not force gcc as CC)
Merging ipsec/master (a4902d914e50 xfrm: merge fixup for "remove output_finish
indirection from xfrm_state_afinfo")
Merging netfilter/master (c3829285b2e6 netfilter: nft_set_pipapo: Disable
preemption before getting per-CPU pointer)
Merging ipvs/master (bdc48fa11e46 checkpatch/coding-style: deprecate 80-column
warning)
Merging wireless-drivers/master (f92f26f2ed2c iwlwifi: pcie: handle QuZ configs
with killer NICs as well)
Merging mac80211/master (59d4bfc1e2c0 net: fix wiki website url mac80211 and
wireless files)
Merging rdma-fixes/for-rc (3d77e6a8804a Linux 5.7)
Merging sound-current/for-linus (a4f55d927d33 Merge tag 'asoc-fix-v5.8' of
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc-fixes/for-linus (9d8b6b458660 Merge remote-tracking branch
'asoc/for-5.8' into asoc-linus)
Merging regmap-fixes/for-linus (7e295e6576af Merge remote-tracking branch
'regmap/for-5.8' into regmap-linus)
Merging regulator-fixes/for-linus (5fb565b69dab Merge remote-tracking branch
'regulator/for-5.8' into regulator-linus)
Merging spi-fixes/for-linus (3580c8a2d813 Merge remote-tracking branch
'spi/for-5.8' into
Re: linux-next: Tree for Jun 11 (drivers/dma/dw-edma/)
On 11-06-19, 10:30, Randy Dunlap wrote: > On 6/11/19 2:24 AM, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20190607: > > > > on x86_64 or i386: > > when CONFIG_PCI is not set/enabled: > > ../drivers/dma/dw-edma/dw-edma-core.c: In function ‘dw_edma_irq_request’: > ../drivers/dma/dw-edma/dw-edma-core.c:784:3: error: implicit declaration of > function ‘pci_irq_vector’ [-Werror=implicit-function-declaration] >err = request_irq(pci_irq_vector(to_pci_dev(dev), 0), >^ Thanks for the report, I am applying the fix YueHaibing with your reported by. -- ~Vinod
Re: linux-next: Tree for Jun 11 (net/dsa/tag_sja1105.c)
On Tue, 11 Jun 2019 at 21:30, Randy Dunlap wrote: > > On 6/11/19 2:24 AM, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20190607: > > > > on i386: > > # > # Library routines > # > # CONFIG_PACKING is not set > > ld: net/dsa/tag_sja1105.o: in function `sja1105_rcv': > tag_sja1105.c:(.text+0x40b): undefined reference to `packing' > ld: tag_sja1105.c:(.text+0x423): undefined reference to `packing' > ld: tag_sja1105.c:(.text+0x43e): undefined reference to `packing' > ld: tag_sja1105.c:(.text+0x456): undefined reference to `packing' > ld: tag_sja1105.c:(.text+0x471): undefined reference to `packing' > > > Should this driver select PACKING? > > > -- > ~Randy Hi Randy, Yes it should, thanks for pointing it out. Are you going to send a patch, or should I? Thanks! -Vladimir
Re: linux-next: Tree for Jun 11 (net/dsa/tag_sja1105.c)
On 6/11/19 2:24 AM, Stephen Rothwell wrote: > Hi all, > > Changes since 20190607: > on i386: # # Library routines # # CONFIG_PACKING is not set ld: net/dsa/tag_sja1105.o: in function `sja1105_rcv': tag_sja1105.c:(.text+0x40b): undefined reference to `packing' ld: tag_sja1105.c:(.text+0x423): undefined reference to `packing' ld: tag_sja1105.c:(.text+0x43e): undefined reference to `packing' ld: tag_sja1105.c:(.text+0x456): undefined reference to `packing' ld: tag_sja1105.c:(.text+0x471): undefined reference to `packing' Should this driver select PACKING? -- ~Randy
Re: linux-next: Tree for Jun 11 (kernel/sysctl.c)
On 6/11/19 2:24 AM, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20190607:
>
on i386:
when CONFIG_SYSCTL is not set/enabled:
../kernel/sysctl.c: In function '_proc_do_string':
../kernel/sysctl.c:2003:7: error: 'sysctl_writes_strict' undeclared (first use
in this function); did you mean 'sysctl_schedstats'?
if (sysctl_writes_strict == SYSCTL_WRITES_STRICT) {
^~~~
sysctl_schedstats
../kernel/sysctl.c:2003:7: note: each undeclared identifier is reported only
once for each function it appears in
../kernel/sysctl.c:2003:31: error: 'SYSCTL_WRITES_STRICT' undeclared (first use
in this function); did you mean 'SPECTRE_V2_USER_STRICT'?
if (sysctl_writes_strict == SYSCTL_WRITES_STRICT) {
^~~~
SPECTRE_V2_USER_STRICT
CC mm/mmu_gather.o
../kernel/sysctl.c: In function 'proc_first_pos_non_zero_ignore':
../kernel/sysctl.c:2079:10: error: 'sysctl_writes_strict' undeclared (first use
in this function); did you mean 'sysctl_schedstats'?
switch (sysctl_writes_strict) {
^~~~
sysctl_schedstats
../kernel/sysctl.c:2080:7: error: 'SYSCTL_WRITES_STRICT' undeclared (first use
in this function); did you mean 'SPECTRE_V2_USER_STRICT'?
case SYSCTL_WRITES_STRICT:
^~~~
SPECTRE_V2_USER_STRICT
../kernel/sysctl.c:2082:7: error: 'SYSCTL_WRITES_WARN' undeclared (first use in
this function); did you mean 'SYSCTL_WRITES_STRICT'?
case SYSCTL_WRITES_WARN:
^~
SYSCTL_WRITES_STRICT
AR arch/x86/hyperv/built-in.a
CC kernel/capability.o
../kernel/sysctl.c:2088:1: warning: control reaches end of non-void function
[-Wreturn-type]
}
^
At top level:
../kernel/sysctl.c:3116:12: warning: 'proc_do_cad_pid' defined but not used
[-Wunused-function]
static int proc_do_cad_pid(struct ctl_table *table, int write,
^~~
../kernel/sysctl.c:2816:12: warning: 'proc_dointvec_minmax_coredump' defined
but not used [-Wunused-function]
static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
^
../kernel/sysctl.c:2795:12: warning: 'proc_dopipe_max_size' defined but not
used [-Wunused-function]
static int proc_dopipe_max_size(struct ctl_table *table, int write,
^~~~
../kernel/sysctl.c:2629:12: warning: 'proc_dointvec_minmax_sysadmin' defined
but not used [-Wunused-function]
static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
^
../kernel/sysctl.c:2597:12: warning: 'proc_taint' defined but not used
[-Wunused-function]
static int proc_taint(struct ctl_table *table, int write,
^~
--
~Randy
Re: linux-next: Tree for Jun 11 (drivers/dma/dw-edma/)
On 6/11/19 2:24 AM, Stephen Rothwell wrote: > Hi all, > > Changes since 20190607: > on x86_64 or i386: when CONFIG_PCI is not set/enabled: ../drivers/dma/dw-edma/dw-edma-core.c: In function ‘dw_edma_irq_request’: ../drivers/dma/dw-edma/dw-edma-core.c:784:3: error: implicit declaration of function ‘pci_irq_vector’ [-Werror=implicit-function-declaration] err = request_irq(pci_irq_vector(to_pci_dev(dev), 0), ^ -- ~Randy
linux-next: Tree for Jun 11
Hi all, Changes since 20190607: The fbdev tree gained a conflict against Linus' tree. The net-next tree gained conflicts against the net tree. It also gained a build failure for which I reverted a commit. The crypto tree gained conflicts against Linus' tree. The drm tree gained conflicts against Linus' tree. The drm-misc tree gained conflicts against the drm tree. The mfd tree gained a conflict against Linus' tree. The tpmdd tree lost its build failure. The clockevents tree gained a conflict against Linus' tree. The slave-dma tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 4978 5463 files changed, 196697 insertions(+), 179013 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 ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 294 trees (counting Linus' and 71 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. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (01ccc3ad4413 Merge tag 'for-linus-20190610' of git://git.kernel.dk/linux-block) Merging fixes/master (3ab4436f688c Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux) Merging kspp-gustavo/for-next/kspp (034e673710d3 platform/x86: acer-wmi: Mark expected switch fall-throughs) Merging kbuild-current/fixes (d1fdb6d8f6a4 Linux 5.2-rc4) Merging arc-current/for-curr (46e04c25e72f ARC: [plat-hsdk] Get rid of inappropriate PHY settings) Merging arm-current/fixes (e17b1af96b2a ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache) Merging arm64-fixes/for-next/fixes (ebcc5928c5d9 arm64: Silence gcc warnings about arch ABI drift) Merging m68k-current/for-linus (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping) Merging powerpc-fixes/fixes (8b909e354870 powerpc/kexec: Fix loading of kernel + initramfs with kexec_file_load()) Merging s390-fixes/fixes (0ab0d7ac2090 s390/unwind: correct stack switching during unwind) Merging sparc/master (30d1d92a888d Merge tag 'nds32-for-linux-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (dce5d123 nfp: ensure skb network header is set for packet redirect) Merging bpf/master (38e406f600a2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) Merging ipsec/master (7c80eb1c7e2b af_key: fix leaks in key_pol_get_resp and dump_sp.) Merging netfilter/master (8a3dca632538 netfilter: ipv6: nf_defrag: accept duplicate fragments again) Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes') Merging wireless-drivers/master (69ae4f6aac15 mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies()) Merging mac80211/master (180aa422ef27 nl80211: fill all policy .type entries) Merging rdma-fixes/for-rc (d1fdb6d8f6a4 Linux 5.2-rc4) Merging sound-current/for-linus (717f43d81afc ALSA: hda/realtek - Update headset mode for ALC256) Merging sound-asoc-fixes/for-linus (05c7b3fc218d Merge branch 'asoc-5.2' into asoc-linus) Merging regmap-fixes/for-linus (301cd2100315 Merge branch 'regmap-5.2' into regmap-linus) Merging regulator-fixes/for-linus (412700f47c19 Merge branch 'regulator-5.2' into regulator-linus) Merging spi-fixes/for-linus (4d96f255dd76 Merge branch 'spi-5.2' into spi-linus) Merging pci-current/for-linus (a188339ca5a3 Linux 5.2-rc1) Merging
linux-next: Tree for Jun 11
Hi all, Changes since 20150610: The drm tree still had its build failures for which I applied a supplied patch. The block tree gained a conflict against the powerpc-mpe tree. The edac-amd tree gained a conflict against the pci tree. Non-merge commits (relative to Linus' tree): 9798 8629 files changed, 907085 insertions(+), 192132 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 ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 219 trees (counting Linus' and 31 trees of patches pending for Linus' tree). 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. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (e64f638483a2 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (c517d838eb7d Linux 4.0-rc1) Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) Merging arm-current/fixes (0bbe6b5a73c0 ARM: 8388/1: tcm: Don't crash when TCM banks are protected by TrustZone) Merging m68k-current/for-linus (b24f670b7f5b m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge-mpe/fixes (c65b99f04684 Linux 4.1-rc6) Merging powerpc-merge/merge (c517d838eb7d Linux 4.0-rc1) Merging sparc/master (c46a024ea5eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging net/master (1b0ccfe54a6a Revert "ipv6: Fix protocol resubmission") Merging ipsec/master (31a418986a58 xen: netback: read hotplug script once at start of day.) Merging sound-current/for-linus (132bd96bc56f ALSA: hda - fix number of devices query on hotplug) Merging pci-current/for-linus (552bc94ebeeb PCI: Preserve resource size during alignment reordering) Merging wireless-drivers/master (38fe44e61a89 Merge tag 'iwlwifi-for-kalle-2015-05-28' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (d4a4f75cd8f2 Linux 4.1-rc7) Merging tty.current/tty-linus (d4a4f75cd8f2 Linux 4.1-rc7) Merging usb.current/usb-linus (d4a4f75cd8f2 Linux 4.1-rc7) Merging usb-gadget-fixes/fixes (c94e289f195e usb: gadget: remove incorrect __init/__exit annotations) Merging usb-serial-fixes/usb-linus (df72d588c54d USB: cp210x: add ID for HubZ dual ZigBee and Z-Wave dongle) Merging staging.current/staging-linus (d4a4f75cd8f2 Linux 4.1-rc7) Merging char-misc.current/char-misc-linus (e26081808eda Linux 4.1-rc4) Merging input-current/for-linus (7f2ca8b55aef Input: synaptics - add min/max quirk for Lenovo S540) Merging crypto-current/master (f858c7bcca8c crypto: algif_aead - Disable AEAD user-space for now) Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) Merging rr-fixes/fixes (f36963c9d3f6 cpumask_set_cpu_local_first => cpumask_local_spread, lament) Merging vfio-fixes/for-linus (db7d4d7f4021 vfio: Fix runaway interruptible timeout) Merging kselftest-fixes/fixes (ba155e2d21f6 Linux 4.1-rc5) Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) Merging drm-intel-fixes/for-linux-next-fixes (3f5f1554ee71 drm/i915: Fix DDC probe for passive adapters) Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of
linux-next: Tree for Jun 11
Hi all, Changes since 20150610: The drm tree still had its build failures for which I applied a supplied patch. The block tree gained a conflict against the powerpc-mpe tree. The edac-amd tree gained a conflict against the pci tree. Non-merge commits (relative to Linus' tree): 9798 8629 files changed, 907085 insertions(+), 192132 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 ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 219 trees (counting Linus' and 31 trees of patches pending for Linus' tree). 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. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (e64f638483a2 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (c517d838eb7d Linux 4.0-rc1) Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) Merging arm-current/fixes (0bbe6b5a73c0 ARM: 8388/1: tcm: Don't crash when TCM banks are protected by TrustZone) Merging m68k-current/for-linus (b24f670b7f5b m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge-mpe/fixes (c65b99f04684 Linux 4.1-rc6) Merging powerpc-merge/merge (c517d838eb7d Linux 4.0-rc1) Merging sparc/master (c46a024ea5eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging net/master (1b0ccfe54a6a Revert ipv6: Fix protocol resubmission) Merging ipsec/master (31a418986a58 xen: netback: read hotplug script once at start of day.) Merging sound-current/for-linus (132bd96bc56f ALSA: hda - fix number of devices query on hotplug) Merging pci-current/for-linus (552bc94ebeeb PCI: Preserve resource size during alignment reordering) Merging wireless-drivers/master (38fe44e61a89 Merge tag 'iwlwifi-for-kalle-2015-05-28' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (d4a4f75cd8f2 Linux 4.1-rc7) Merging tty.current/tty-linus (d4a4f75cd8f2 Linux 4.1-rc7) Merging usb.current/usb-linus (d4a4f75cd8f2 Linux 4.1-rc7) Merging usb-gadget-fixes/fixes (c94e289f195e usb: gadget: remove incorrect __init/__exit annotations) Merging usb-serial-fixes/usb-linus (df72d588c54d USB: cp210x: add ID for HubZ dual ZigBee and Z-Wave dongle) Merging staging.current/staging-linus (d4a4f75cd8f2 Linux 4.1-rc7) Merging char-misc.current/char-misc-linus (e26081808eda Linux 4.1-rc4) Merging input-current/for-linus (7f2ca8b55aef Input: synaptics - add min/max quirk for Lenovo S540) Merging crypto-current/master (f858c7bcca8c crypto: algif_aead - Disable AEAD user-space for now) Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) Merging rr-fixes/fixes (f36963c9d3f6 cpumask_set_cpu_local_first = cpumask_local_spread, lament) Merging vfio-fixes/for-linus (db7d4d7f4021 vfio: Fix runaway interruptible timeout) Merging kselftest-fixes/fixes (ba155e2d21f6 Linux 4.1-rc5) Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) Merging drm-intel-fixes/for-linux-next-fixes (3f5f1554ee71 drm/i915: Fix DDC probe for passive adapters) Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of
linux-next: Tree for Jun 11
Hi all, The powerpc allyesconfig is again broken more than usual. Changes since 20140610: Dropped tree: drm-intel-fixes (build problems) The drm-intel-fixes still had its build failure so I dropped it at the maintainers request. The pci tree gained a build failure so I used the version from next-20140610. The akpm tree lost several patches that turned up elsewhere. Non-merge commits (relative to Linus' tree): 3911 3097 files changed, 122540 insertions(+), 56951 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 ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 219 trees (counting Linus' and 29 trees of patches pending for Linus' tree). 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. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (2937f5efa575 Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86) Merging fixes/master (4b660a7f5c80 Linux 3.15-rc6) Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1) Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4) Merging arm-current/fixes (3f8517e7937d ARM: 8063/1: bL_switcher: fix individual online status reporting of removed CPUs) Merging m68k-current/for-linus (e8d6dc5ad26e m68k/hp300: Convert printk to pr_foo()) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging powerpc-merge/merge (8212f58a9b15 powerpc: Wire renameat2() syscall) Merging sparc/master (8ecc1bad4c9b sparc64: fix format string mismatch in arch/sparc/kernel/sysfs.c) Merging net/master (87757a917b0b net: force a list_del() in unregister_netdevice_many()) Merging ipsec/master (6d004d6cc739 vti: Use the tunnel mark for lookup in the error handlers.) Merging sound-current/for-linus (6538de03a98f ALSA: hda - Add quirk for ABit AA8XE) Merging pci-current/for-linus (d0b4cc4e3270 PCI: Wrong register used to check pending traffic) Merging wireless/master (2c316e699fa4 Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (4b660a7f5c80 Linux 3.15-rc6) Merging tty.current/tty-linus (d6d211db37e7 Linux 3.15-rc5) Merging usb.current/usb-linus (5dc2808c4729 xhci: delete endpoints from bandwidth list before freeing whole device) Merging usb-gadget-fixes/fixes (886c7c426d46 usb: gadget: at91-udc: fix irq and iomem resource retrieval) Merging staging.current/staging-linus (9326c5ca0982 staging: r8192e_pci: fix htons error) Merging char-misc.current/char-misc-linus (d1db0eea8524 Linux 3.15-rc3) Merging input-current/for-linus (a292241cccb7 Merge branch 'next' into for-linus) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (3901c1124ec5 crypto: s390 - fix aes,des ctr mode concurrency finding.) Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (4b660a7f5c80 Linux 3.15-rc6) Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.) Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works) Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus) Merging drm-intel-fixes/for-linux-next-fixes (15d24aa5602f drm/i915: BDW: Adding missing cursor offsets.) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c CONFLICT (content): Merge conflict in
linux-next: Tree for Jun 11
Hi all, The powerpc allyesconfig is again broken more than usual. Changes since 20140610: Dropped tree: drm-intel-fixes (build problems) The drm-intel-fixes still had its build failure so I dropped it at the maintainers request. The pci tree gained a build failure so I used the version from next-20140610. The akpm tree lost several patches that turned up elsewhere. Non-merge commits (relative to Linus' tree): 3911 3097 files changed, 122540 insertions(+), 56951 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 ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 219 trees (counting Linus' and 29 trees of patches pending for Linus' tree). 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. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (2937f5efa575 Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86) Merging fixes/master (4b660a7f5c80 Linux 3.15-rc6) Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1) Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4) Merging arm-current/fixes (3f8517e7937d ARM: 8063/1: bL_switcher: fix individual online status reporting of removed CPUs) Merging m68k-current/for-linus (e8d6dc5ad26e m68k/hp300: Convert printk to pr_foo()) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging powerpc-merge/merge (8212f58a9b15 powerpc: Wire renameat2() syscall) Merging sparc/master (8ecc1bad4c9b sparc64: fix format string mismatch in arch/sparc/kernel/sysfs.c) Merging net/master (87757a917b0b net: force a list_del() in unregister_netdevice_many()) Merging ipsec/master (6d004d6cc739 vti: Use the tunnel mark for lookup in the error handlers.) Merging sound-current/for-linus (6538de03a98f ALSA: hda - Add quirk for ABit AA8XE) Merging pci-current/for-linus (d0b4cc4e3270 PCI: Wrong register used to check pending traffic) Merging wireless/master (2c316e699fa4 Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (4b660a7f5c80 Linux 3.15-rc6) Merging tty.current/tty-linus (d6d211db37e7 Linux 3.15-rc5) Merging usb.current/usb-linus (5dc2808c4729 xhci: delete endpoints from bandwidth list before freeing whole device) Merging usb-gadget-fixes/fixes (886c7c426d46 usb: gadget: at91-udc: fix irq and iomem resource retrieval) Merging staging.current/staging-linus (9326c5ca0982 staging: r8192e_pci: fix htons error) Merging char-misc.current/char-misc-linus (d1db0eea8524 Linux 3.15-rc3) Merging input-current/for-linus (a292241cccb7 Merge branch 'next' into for-linus) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding discard stripe) Merging crypto-current/master (3901c1124ec5 crypto: s390 - fix aes,des ctr mode concurrency finding.) Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (4b660a7f5c80 Linux 3.15-rc6) Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.) Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works) Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus) Merging drm-intel-fixes/for-linux-next-fixes (15d24aa5602f drm/i915: BDW: Adding missing cursor offsets.) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c CONFLICT (content): Merge conflict in
