linux-next: Tree for May 9
Hi all, Changes since 20190508: The jc_docs tree gained a conflict against Linus' tree. The mfd tree gained a conflict against Linus' tree. The akpm-current tree gained conflicts against the rdma and parisc-hd trees. Non-merge commits (relative to Linus' tree): 5622 4856 files changed, 218813 insertions(+), 78495 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 298 trees (counting Linus' and 69 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 (ef75bd71c5d3 Merge tag 'gfs2-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) Merging fixes/master (d15da9d3fb74 kernel/compat.c: mark expected switch fall-throughs) Merging kspp-gustavo/for-next/kspp (ccaa75187a5f memstick: mark expected switch fall-throughs) Merging kbuild-current/fixes (79a3aaa7b82e Linux 5.1-rc3) Merging arc-current/for-curr (8b21baee8e48 ARC: fix build warnings) Merging arm-current/fixes (e17b1af96b2a ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache) Merging arm64-fixes/for-next/fixes (4e69ecf4da1e arm64/module: ftrace: deal with place relative nature of PLTs) Merging m68k-current/for-linus (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping) Merging powerpc-fixes/fixes (12f363511d47 powerpc/32s: Fix BATs setting with CONFIG_STRICT_KERNEL_RWX) Merging sparc/master (7d762d69145a afs: Fix manually set volume location server list) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (3b2c4f4d63a5 net: dsa: sja1105: Don't return a negative in u8 sja1105_stp_state_get) Merging bpf/master (a3147770bea7 cxgb4: Fix error path in cxgb4_init_module) Merging ipsec/master (9b3040a6aafd ipv4: Define __ipv4_neigh_lookup_noref when CONFIG_INET is disabled) Merging netfilter/master (8cd2bc981c53 netfilter: nf_flow_table: do not flow offload deleted conntrack entries) Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects) Merging wireless-drivers/master (7a0f8ad5ff63 Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging mac80211/master (517879147493 mac80211: don't attempt to rename ERR_PTR() debugfs dirs) Merging rdma-fixes/for-rc (2557fabd6e29 RDMA/hns: Bugfix for mapping user db) Merging sound-current/for-linus (89d8b8d60d97 Merge tag 'asoc-v5.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) CONFLICT (content): Merge conflict in MAINTAINERS Merging sound-asoc-fixes/for-linus (abcf6fd4008c Merge branch 'asoc-5.1' into asoc-linus) Merging regmap-fixes/for-linus (7fdc9fc87492 Merge branch 'regmap-5.1' into regmap-linus) Merging regulator-fixes/for-linus (c7b5128f72ef Merge branch 'regulator-5.1' into regulator-linus) Merging spi-fixes/for-linus (2a200034ac73 Merge branch 'spi-5.1' into spi-linus) Merging pci-current/for-linus (9c9c5fc89b09 PCI/LINK: Add Kconfig option (default off)) Merging driver-core.current/driver-core-linus (e7a1414f9dc3 Merge tag 'media/v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) Merging tty.current/tty-linus (e7a1414f9dc3 Merge tag 'media/v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) Merging usb.current/usb-linus (e7a1414f9dc3 M
Re: linux-next: Tree for May 9 (mlx5)
On Wed, 2018-05-09 at 08:31 -0700, Randy Dunlap wrote: > On 05/09/2018 04:21 AM, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20180508: > > > > on x86_64: > # CONFIG_SMP is not set > > In file included from > ../drivers/net/ethernet/mellanox/mlx5/core/main.c:43:0: > ../include/linux/mlx5/driver.h: In function > 'mlx5_get_vector_affinity_hint': > ../include/linux/mlx5/driver.h:1299:13: error: 'struct irq_desc' has > no member named 'affinity_hint' > return desc->affinity_hint; > ^ > > Hi Stephen, Israel and Max are working on a solution, will provide it ASAP. Thanks, Saeed.
Re: linux-next: Tree for May 9 (mlx5)
On 05/09/2018 04:21 AM, Stephen Rothwell wrote: > Hi all, > > Changes since 20180508: > on x86_64: # CONFIG_SMP is not set In file included from ../drivers/net/ethernet/mellanox/mlx5/core/main.c:43:0: ../include/linux/mlx5/driver.h: In function 'mlx5_get_vector_affinity_hint': ../include/linux/mlx5/driver.h:1299:13: error: 'struct irq_desc' has no member named 'affinity_hint' return desc->affinity_hint; ^ -- ~Randy
linux-next: Tree for May 9
Hi all,
Changes since 20180508:
New tree: mediatek
The net-next tree gained conflicts against the net tree.
The nvdimm tree gained a conflict against the jc_docs tree.
The akpm-current tree gained a conflict against the jc_docs tree.
Non-merge commits (relative to Linus' tree): 4827
4713 files changed, 182710 insertions(+), 86191 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 258 trees (counting Linus' and 44 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 (036db8bd9637 Merge branch 'for-4.17-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata)
Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of
git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging kbuild-current/fixes (0da7e4326114 genksyms: fix typo in
parse.tab.{c,h} generation rules)
Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4)
Merging arm-current/fixes (30cfae461581 ARM: replace unnecessary perl with sed
and the shell $(( )) operator)
Merging arm64-fixes/for-next/fixes (3789c122d0a0 arm64: avoid instrumenting
atomic_ll_sc.o)
Merging m68k-current/for-linus (ecd685580c8f m68k/mac: Remove bogus "FIXME"
comment)
Merging powerpc-fixes/fixes (b2d7ecbe3556 powerpc/kvm/booke: Fix altivec
related build break)
Merging sparc/master (fff75eb2a08c Merge tag 'errseq-v4.17' of
git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (42f02130f980 Merge tag 'linux-can-fixes-for-4.17-20180508'
of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can)
Merging bpf/master (2ba5622fba85 Merge
git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
Merging ipsec/master (2c5d5b13c6eb llc: better deal with too small mtu)
Merging netfilter/master (ccc4ef2178bf netfilter: nf_tables: bogus EBUSY in
chain deletions)
Merging ipvs/master (2f99aa31cd7a netfilter: nf_tables: skip synchronize_rcu if
transaction log is empty)
Merging wireless-drivers/master (a8d7aa17bbc9 dccp: fix tasklet usage)
Merging mac80211/master (914eac248d87 mac80211: use timeout from the AddBA
response instead of the request)
Merging rdma-fixes/for-rc (9aa169213d11 RDMA/cma: Do not query GID during QP
state transition to RTR)
Merging sound-current/for-linus (f13876e2c33a ALSA: pcm: Check PCM state at
xfern compat ioctl)
Merging pci-current/for-linus (0cf22d6b317c PCI: Add "PCIe" to
pcie_print_link_status() messages)
Merging driver-core.current/driver-core-linus (6da6c0db5316 Linux v4.17-rc3)
Merging tty.current/tty-linus (6da6c0db5316 Linux v4.17-rc3)
Merging usb.current/usb-linus (75bc37fefc44 Linux 4.17-rc4)
Merging usb-gadget-fixes/fixes (ed769520727e usb: gadget: composite Allow for
larger configuration descriptors)
Merging usb-serial-fixes/usb-linus (4842ed5bfcb9 USB: serial: visor: handle
potential invalid device configuration)
Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm:
fix ulpi-node lookup)
Merging phy/fixes (60cc43fc8884 Linux 4.17-rc1)
Merging staging.current/staging-linus (6da6c0db5316 Linux v4.17-rc3)
Merging char-misc.current/char-misc-linus (6da6c0db5316 Linux v4.17-rc3)
Merging input-current/for-linus (f6eeb9e54857 Input: atmel_mxt_ts - add missing
compatible strings to OF dev
linux-next: Tree for May 9
Hi all, Please do not add any v4.13 destined material in your linux-next included branches until after v4.12-rc1 has been released. Changes since 20170508: Non-merge commits (relative to Linus' tree): 2374 2523 files changed, 83999 insertions(+), 42709 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 (with CONFIG_BUILD_DOCSRC=n) 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. Below is a summary of the state of the merge. I am currently merging 258 trees (counting Linus' and 37 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 (2d3e4866dea9 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) Merging fixes/master (97da3854c526 Linux 4.11-rc3) Merging kbuild-current/fixes (9be3213b14d4 gconfig: remove misleading parentheses around a condition) Merging arc-current/for-curr (cf4100d1cddc Revert "ARCv2: Allow enabling PAE40 w/o HIGHMEM") Merging arm-current/fixes (6d8059493691 ARM: 8670/1: V7M: Do not corrupt vector table around v7m_invalidate_l1 call) Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (be5c5e843c4a powerpc/64: Fix HMI exception on LE with CONFIG_RELOCATABLE=y) Merging sparc/master (8c64415cc1f5 sparc: Remove redundant tests in boot_flags_init().) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (922c60e89d52 net: mdio-mux: bcm-iproc: call mdiobus_free() in error path) Merging ipsec/master (2c1497bbc8fd xfrm: Fix NETDEV_DOWN with IPSec offload) Merging netfilter/master (f411af682218 Merge branch 'ibmvnic-Updated-reset-handler-andcode-fixes') Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections) Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype avoiding use-after-free of virtual interface) Merging mac80211/master (29cee56c0be4 Merge tag 'mac80211-for-davem-2017-05-08' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) Merging sound-current/for-linus (a5c3b32a1146 Merge tag 'asoc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging pci-current/for-linus (b9c1153f7a9c PCI: hisi: Fix DT binding (hisi-pcie-almost-ecam)) Merging driver-core.current/driver-core-linus (af82455f7dbd Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) Merging tty.current/tty-linus (4f7d029b9bf0 Linux 4.11-rc7) Merging usb.current/usb-linus (a71c9a1c779f Linux 4.11-rc5) Merging usb-gadget-fixes/fixes (25cd9721c2b1 usb: gadget: f_hid: fix: Don't access hidg->req without spinlock held) Merging usb-serial-fixes/usb-linus (c02ed2e75ef4 Linux 4.11-rc4) Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) Merging phy/fixes (1a09b6a7c10e phy: qcom-usb-hs: Add depends on EXTCON) Merging staging.current/staging-linus (13e098814037 docs: complete bumping minimal GNU Make version to 3.81) Merging char-misc.current/char-misc-linus (af82455f7dbd Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) Merging input-current/for-linus (4706aa075662 Input: xpad - add USB IDs for Mad Catz Brawlstick and Razer Sabertooth) Merging crypto-current/master (929562b14478 crypto: stm32 - Fix OF module alias information) Merging ide/master (acfead32f3f9 ide: don't call
linux-next: Tree for May 9
Hi all,
Changes since 20160506:
Dropped tree: hsi (at the maintainer's request)
The f2fs tree gained a conflict against the ext4 tree.
The libata tree gained a build failure so I used the version from
next-20160506 for today.
The net-next tree gained conflicts against the wireless-drivers and
net trees.
The drm tree gained conflicts against Linus' tree.
The sound-asoc tree lost its build failure.
Non-merge commits (relative to Linus' tree): 8795
7764 files changed, 383723 insertions(+), 168978 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 (with
CONFIG_BUILD_DOCSRC=n) 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
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 235 trees (counting Linus' and 35 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 Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (44549e8f5eea Linux 4.6-rc7)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on
module install)
Merging arc-current/for-curr (26f9d5fd82ca ARC: support HIGHMEM even without
PAE40)
Merging arm-current/fixes (ec953b70f368 ARM: 8573/1: domain: move
{set,get}_domain under config guard)
Merging m68k-current/for-linus (7b8ba82ad4ad m68k/defconfig: Update defconfigs
for v4.6-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached
build errors)
Merging powerpc-fixes/fixes (b4c112114aab powerpc: Fix bad inline asm
constraint in create_zero_mask())
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (33656a1f2ee5 Merge branch 'for_linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
Merging net/master (8c1f45462574 netxen: netxen_rom_fast_read() doesn't return
-1)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (f28f20da704d Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging wireless-drivers/master (cbbba30f1ac9 Merge tag
'iwlwifi-for-kalle-2016-05-04' of
https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if
dev_alloc_name() fails)
Merging sound-current/for-linus (2d2c038a ALSA: usb-audio: Quirk for yet
another Phoenix Audio devices (v2))
Merging pci-current/for-linus (9a2a5a638f8e PCI: Do not treat EPROBE_DEFER as
device attach failure)
Merging driver-core.current/driver-core-linus (c3b46c73264b Linux 4.6-rc4)
Merging tty.current/tty-linus (02da2d72174c Linux 4.6-rc5)
Merging usb.current/usb-linus (9be427efc764 Revert "USB / PM: Allow USB devices
to remain runtime-suspended when sleeping")
Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix
use-after-free)
Merging usb-serial-fixes/usb-linus (74d2a91aec97 USB: serial: option: add even
more ZTE device ids)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg:
change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (2b86c4a84377 Merge tag
'iio-fixes-for-4.6d' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio
into staging-linus)
Merging char-misc.current/char-misc-linus (d1306eb675ad nvmem: mxs-ocotp: fix
buffer overflow in read)
Merging input-current/for-linus (eb43335c4095 Input: atmel_mxt_ts - use
mxt_acquire_irq in mxt_soft_reset)
Merging crypto-current/master (58446fef579e crypto: rsa - select crypto mgr
dependency)
Merging ide/master (1993b176a822 Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging device
linux-next: Tree for May 9
Hi all, This tree still fails (more than usual) the powerpc allyesconfig build and also the celleb_defconfig. Changes since 20140508: The powerpc tree still had its build failure. The bluetooth tree gained a conflict against Linus' tree. The crypto tree gained conflicts against the crypto-current and Linus' trees. The mmc tree gained a conflict against Linus' tree. The tip tree gained conflicts against the block and pm trees. Non-merge commits (relative to Linus' tree): 4501 4211 files changed, 151888 insertions(+), 93171 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" as mentioned in the FAQ on the wiki (see below). 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 216 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 (f322e262386d Merge tag 'trace-fixes-v3.15-rc4-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator) Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1) Merging arc-current/for-curr (a798c10faf62 Linux 3.15-rc2) Merging arm-current/fixes (d93003e8e4e1 ARM: 8042/1: iwmmxt: allow to build iWMMXt on Marvell PJ4B) Merging m68k-current/for-linus (50be9eba831d m68k: Update defconfigs for v3.14-rc1) Merging metag-fixes/fixes (a798c10faf62 Linux 3.15-rc2) Merging powerpc-merge/merge (e4565362c7ad powerpc/4xx: Fix section mismatch in ppc4xx_pci.c) Merging sparc/master (e5c460f46ae7 sparc64: Don't bark so loudly about 32-bit tasks generating 64-bit fault addresses.) Merging net/master (23a456f05353 net: mdio: of_mdiobus_register(): fall back to mdiobus_register() for !CONFIG_OF) Merging ipsec/master (edb666f07e53 xfrm6: Properly handle unsupported protocols) CONFLICT (content): Merge conflict in net/ipv4/ip_vti.c Merging sound-current/for-linus (f06ab794af70 ALSA: hda - hdmi: Set converter channel count even without sink) Merging pci-current/for-linus (f5d3352b2751 PCI: tegra: Use new OF interrupt mapping when possible) Merging wireless/master (d2e5cb4e2208 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (d1db0eea8524 Linux 3.15-rc3) Merging tty.current/tty-linus (62a0d8d7c2b2 tty: Fix lockless tty buffer race) Merging usb.current/usb-linus (6ed07d45d09b USB: Nokia 5300 should be treated as unusual dev) Merging usb-gadget-fixes/fixes (886c7c426d46 usb: gadget: at91-udc: fix irq and iomem resource retrieval) Merging staging.current/staging-linus (3519acb3b0c2 Merge branch 'imx-drm-fixes-urgent' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into staging-linus) Merging char-misc.current/char-misc-linus (d1db0eea8524 Linux 3.15-rc3) Merging input-current/for-linus (36189cc3cd57 Input: elantech - fix touchpad initialization on Gigabyte U2442) 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 (58b116bce136 drivercore: deferral race condition fix) 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-fix
Re: linux-next: Tree for May 9
On Thu, 9 May 2013, Stephen Rothwell wrote: > Hi all, > > Please do not add any v3.11 destined work to your linux-next included > branches until after v3.10-rc1 is released. > > Changes since 20130508: > > The microblaze tree gained a conflict against Linus' tree > > The regmap tree gained a conflict against Linus' tree > > The vhost tree gained a conflict against Linus' tree. > > on i386 randconfig, when USB_DWC3=y USB_DWC3_DUAL_ROLE=y USB_GADGET=m: drivers/built-in.o: In function `dwc3_gadget_giveback': next20130509/drivers/usb/dwc3/gadget.c:271: undefined reference to `usb_gadget_unmap_request' drivers/built-in.o: In function `__dwc3_gadget_kick_transfer': next20130509/drivers/usb/dwc3/gadget.c:1005: undefined reference to `usb_gadget_unmap_request' drivers/built-in.o: In function `__dwc3_gadget_ep_queue': next20130509/drivers/usb/dwc3/gadget.c:1073: undefined reference to `usb_gadget_map_request' drivers/built-in.o: In function `dwc3_gadget_reset_interrupt': next20130509/drivers/usb/dwc3/gadget.c:2165: undefined reference to `usb_gadget_set_state' drivers/built-in.o: In function `dwc3_gadget_init': next20130509/drivers/usb/dwc3/gadget.c:2647: undefined reference to `usb_add_gadget_udc' drivers/built-in.o: In function `dwc3_gadget_exit': next20130509/drivers/usb/dwc3/gadget.c:2681: undefined reference to `usb_del_gadget_udc' drivers/built-in.o: In function `__dwc3_ep0_do_control_data': next20130509/drivers/usb/dwc3/ep0.c:906: undefined reference to `usb_gadget_map_request' next20130509/drivers/usb/dwc3/ep0.c:929: undefined reference to `usb_gadget_map_request' drivers/built-in.o: In function `dwc3_ep0_set_config': next20130509/drivers/usb/dwc3/ep0.c:575: undefined reference to `usb_gadget_set_state' next20130509/drivers/usb/dwc3/ep0.c:556: undefined reference to `usb_gadget_set_state' drivers/built-in.o: In function `dwc3_ep0_set_address': next20130509/drivers/usb/dwc3/ep0.c:522: undefined reference to `usb_gadget_set_state' next20130509/drivers/usb/dwc3/ep0.c:520: undefined reference to `usb_gadget_set_state' make: *** [vmlinux] Error 1 > > 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" as mentioned in the FAQ on the wiki > (see below). > > 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. After the > final fixups (if any), it is also built with powerpc allnoconfig (32 and > 64 bit), ppc44x_defconfig and allyesconfig (minus > CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, > sparc64 and arm defconfig. These builds also have > CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and > CONFIG_DEBUG_INFO disabled when necessary. > > Below is a summary of the state of the merge. > > We are up to 224 trees (counting Linus' and 31 trees of patches pending > for Linus' tree), more are welcome (even if they are currently empty). > Thanks to those who have contributed, and to those who haven't, please do. > > 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. > > There is a wiki covering stuff to do with linux-next at > http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. > > -- > Cheers, > Stephen Rothwells...@canb.auug.org.au > > $ git checkout master > $ git reset --hard stable > Merging origin/master (e0fd9af Merge tag 'rdma-for-linus' of > git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband) > Merging fixes/master (0279b3c Merge branch 'sched-urgent-for-linus' of > git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) > Merging kbuild-current/rc-fixes (a54292f kbuild: generate generic headers > before recursing into scripts) > Merging arc-current/for-curr (eacd0e9 ARC: [mm] Lazy D-cache flush (non > aliasing VIPT)) > Merging arm-current/fixes (1783d45 ARM: 7700/2: Make cpu_init() notrace) > Merging m68k-current/for-linus (e00c73e m68k: Remove inline strlen() > implementation) > Merging powerpc-merge/merge (5737789 powerpc: Make hard_irq_disable() do the > right thing vs. irq tracing) > Merging sparc/master (de9c9f8 Merge tag 'remoteproc-3.10' of > git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc
linux-next: Tree for May 9
Hi all, Please do not add any v3.11 destined work to your linux-next included branches until after v3.10-rc1 is released. Changes since 20130508: The microblaze tree gained a conflict against Linus' tree The regmap tree gained a conflict against Linus' tree The vhost tree gained a conflict against Linus' tree. 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" as mentioned in the FAQ on the wiki (see below). 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. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 224 trees (counting Linus' and 31 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do. 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. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (e0fd9af Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband) Merging fixes/master (0279b3c Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging kbuild-current/rc-fixes (a54292f kbuild: generate generic headers before recursing into scripts) Merging arc-current/for-curr (eacd0e9 ARC: [mm] Lazy D-cache flush (non aliasing VIPT)) Merging arm-current/fixes (1783d45 ARM: 7700/2: Make cpu_init() notrace) Merging m68k-current/for-linus (e00c73e m68k: Remove inline strlen() implementation) Merging powerpc-merge/merge (5737789 powerpc: Make hard_irq_disable() do the right thing vs. irq tracing) Merging sparc/master (de9c9f8 Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc) Merging net/master (4f924b2 if_cablemodem.h: Add parenthesis around ioctl macros) Applying: drivers:net: fix up for code movement from rt2x00pci.c Merging ipsec/master (da241ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging sound-current/for-linus (4ca231b ALSA: usb-audio: caiaq: fix endianness bug in snd_usb_caiaq_maschine_dispatch) Merging pci-current/for-linus (e253aaf PCI: Delay final fixups until resources are assigned) Merging wireless/master (ccd384b mwifiex: fix setting of multicast filter) Merging driver-core.current/driver-core-linus (9affd6b arm: fix mismerge of arch/arm/mach-omap2/timer.c) Merging tty.current/tty-linus (9affd6b arm: fix mismerge of arch/arm/mach-omap2/timer.c) Merging usb.current/usb-linus (9affd6b arm: fix mismerge of arch/arm/mach-omap2/timer.c) Merging staging.current/staging-linus (9affd6b arm: fix mismerge of arch/arm/mach-omap2/timer.c) Merging char-misc.current/char-misc-linus (9affd6b arm: fix mismerge of arch/arm/mach-omap2/timer.c) Merging input-current/for-linus (f0aacea Input: wacom - add a few new styli for Cintiq series) Merging md-current/for-linus (32f9f57 MD: ignore discard request for hard disks of hybid raid1/raid10 array) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (3862de1 crypto: caam - fix job ring cleanup code) Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe()) Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6) Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS) Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error)
