* Re: linux-next: manual merge of the rcu tree with the tip tree
From: Paul E. McKenney @ 2016-07-19 3:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel, Anna-Maria Gleixner
In-Reply-To: <20160718152628.312b3e43@canb.auug.org.au>
On Mon, Jul 18, 2016 at 03:26:28PM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> kernel/rcu/tree.c
>
> between commit:
>
> 4df8374254ea ("rcu: Convert rcutree to hotplug state machine")
>
> from the tip tree and commit:
>
> 2a84cde733b0 ("rcu: Exact CPU-online tracking for RCU")
>
> from the rcu tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Ah, that is in -tip now? Easier to test, then!
Thank you, the patch looks good at first glance, but will beat it up
a bit.
Thanx, Paul
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc kernel/rcu/tree.c
> index e5164deb51e1,5663d1e899d3..000000000000
> --- a/kernel/rcu/tree.c
> +++ b/kernel/rcu/tree.c
> @@@ -3812,54 -3809,34 +3809,80 @@@ int rcutree_prepare_cpu(unsigned int cp
>
> for_each_rcu_flavor(rsp)
> rcu_init_percpu_data(cpu, rsp);
> +
> + rcu_prepare_kthreads(cpu);
> + rcu_spawn_all_nocb_kthreads(cpu);
> +
> + return 0;
> +}
> +
> +static void rcutree_affinity_setting(unsigned int cpu, int outgoing)
> +{
> + struct rcu_data *rdp = per_cpu_ptr(rcu_state_p->rda, cpu);
> +
> + rcu_boost_kthread_setaffinity(rdp->mynode, outgoing);
> +}
> +
> +int rcutree_online_cpu(unsigned int cpu)
> +{
> + sync_sched_exp_online_cleanup(cpu);
> + rcutree_affinity_setting(cpu, -1);
> + return 0;
> +}
> +
> +int rcutree_offline_cpu(unsigned int cpu)
> +{
> + rcutree_affinity_setting(cpu, cpu);
> + return 0;
> +}
> +
> +
> +int rcutree_dying_cpu(unsigned int cpu)
> +{
> + struct rcu_state *rsp;
> +
> + for_each_rcu_flavor(rsp)
> + rcu_cleanup_dying_cpu(rsp);
> + return 0;
> +}
> +
> +int rcutree_dead_cpu(unsigned int cpu)
> +{
> + struct rcu_state *rsp;
> +
> + for_each_rcu_flavor(rsp) {
> + rcu_cleanup_dead_cpu(cpu, rsp);
> + do_nocb_deferred_wakeup(per_cpu_ptr(rsp->rda, cpu));
> + }
> + return 0;
> }
>
> + /*
> + * Mark the specified CPU as being online so that subsequent grace periods
> + * (both expedited and normal) will wait on it. Note that this means that
> + * incoming CPUs are not allowed to use RCU read-side critical sections
> + * until this function is called. Failing to observe this restriction
> + * will result in lockdep splats.
> + */
> + void rcu_cpu_starting(unsigned int cpu)
> + {
> + unsigned long flags;
> + unsigned long mask;
> + struct rcu_data *rdp;
> + struct rcu_node *rnp;
> + struct rcu_state *rsp;
> +
> + for_each_rcu_flavor(rsp) {
> + rdp = this_cpu_ptr(rsp->rda);
> + rnp = rdp->mynode;
> + mask = rdp->grpmask;
> + raw_spin_lock_irqsave_rcu_node(rnp, flags);
> + rnp->qsmaskinitnext |= mask;
> + rnp->expmaskinitnext |= mask;
> + raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
> + }
> + }
> +
> #ifdef CONFIG_HOTPLUG_CPU
> /*
> * The CPU is exiting the idle loop into the arch_cpu_idle_dead()
> @@@ -4208,9 -4231,12 +4231,11 @@@ void __init rcu_init(void
> * this is called early in boot, before either interrupts
> * or the scheduler are operational.
> */
> - cpu_notifier(rcu_cpu_notify, 0);
> pm_notifier(rcu_pm_notify, 0);
> - for_each_online_cpu(cpu)
> + for_each_online_cpu(cpu) {
> - rcu_cpu_notify(NULL, CPU_UP_PREPARE, (void *)(long)cpu);
> + rcutree_prepare_cpu(cpu);
> + rcu_cpu_starting(cpu);
> + }
> }
>
> #include "tree_exp.h"
>
^ permalink raw reply
* Re: [PATCH/RFC] Re: linux-next: build failure after merge of the luto-misc tree
From: Stephen Rothwell @ 2016-07-19 3:26 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Andy Lutomirski, Arnaldo Carvalho de Melo, Peter Zijlstra,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20160719003906.GJ2207@kernel.org>
Hi Arnaldo,
On Mon, 18 Jul 2016 21:39:06 -0300 Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
>
> Em Tue, Jul 19, 2016 at 10:26:29AM +1000, Stephen Rothwell escreveu:
>
> > If you have a single patch (or few) relative to yesterday's tip tree,
> > please send it to me as well and I will apply it as a fix patch if Ingo
> > doesn't get to pulling in time.
>
> [acme@jouet linux]$ git log --pretty=oneline 9fcfcdf3c7b613c0d9536f57587456411b8a4e33..ae3c14a028ed10552803b68276b6833295ba18cf
> ae3c14a028ed10552803b68276b6833295ba18cf tools: Copy linux/{hash,poison}.h and check for drift
> 3aa0042769313b720142c0ef8514dac389e14ebe perf tools: Remove include/linux/list.h from perf's MANIFEST
> de1e17b1d0c81be472039798698b517c8a68b516 tools: Copy the bitops files accessed from the kernel and check for drift
> ad430729ae00dd63f7dcadbeb638e589bc03b5a3 Remove: kernel unistd*h files from perf's MANIFEST, not used
> e0643c4e9fdb2e77ab83ca596460e2c9c15728aa perf tools: Remove tools/perf/util/include/linux/const.h
> 7e3f36411342a54f1981fa97b43550b8406a3d69 perf tools: Remove tools/perf/util/include/asm/byteorder.h
> 14f0652b4fbebd0b05da36a06b17ac6d4d87a8f8 perf tools: Add missing linux/compiler.h include to perf-sys.h
>
> Available on my repo/branch:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/core
>
> I don't know exactly how linux-next works, would it be possible to merge in this branch
> till it gets into tip/perf/core?
OK, I added this to linux-next today (as a temporary measure), but it
fails the same way. To be clear, I merged the above branch (without
the rest of the tip tree) and it fails the same way. :-(
It produces these errors (from the x86_64 allmodconfig build):
In file included from /home/sfr/next/next/tools/arch/x86/include/uapi/asm/bitsperlong.h:10:0,
from /usr/include/asm-generic/int-ll64.h:11,
from /usr/include/powerpc64le-linux-gnu/asm/types.h:27,
from /home/sfr/next/next/tools/include/linux/types.h:9,
from /home/sfr/next/next/tools/include/linux/list.h:4,
from elf.h:23,
from elf.c:30:
/home/sfr/next/next/tools/include/asm-generic/bitsperlong.h:13:2: error: #error Inconsistent word size. Check asm/bitsperlong.h
#error Inconsistent word size. Check asm/bitsperlong.h
^
(and more similar).
I have applied my patch from yesterday ("tools: Simplify
__BITS_PER_LONG define"), and will continue on.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the pm tree with the i2c tree
From: Wolfram Sang @ 2016-07-19 3:48 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Stephen Rothwell, linux-next, linux-kernel, Octavian Purdila,
Jarkko Nikula, Andy Shevchenko, Mika Westerberg
In-Reply-To: <2565257.LbcJLfl1sl@vostro.rjw.lan>
[-- Attachment #1: Type: text/plain, Size: 772 bytes --]
> > Well, not knowing much about ACPI, I just need the conflict resolution
> > for my latest i2c/for-next and your above branch. If you want to do it,
> > fine with me. But maybe Jarkko will be back to office on Monday, too.
>
> Unfortunately, I don't see how these branches can be merged in a sensible
> way without adding too much new code into the merge itself.
>
> Something needs to be dropped and then rebased and applied again.
Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
there was also a driver patch making use of the core changes for which I
requested some updates. Since those did not happen yet (Jarkko on
holiday?), the core patches alone are not important anyhow.
Thanks for looking into it!
Wolfram
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the wireless-drivers-next tree
From: Stephen Rothwell @ 2016-07-19 6:08 UTC (permalink / raw)
To: Kalle Valo, linux-wireless
Cc: linux-next, linux-kernel, Rafał Miłecki
Hi all,
After merging the wireless-drivers-next tree, today's linux-next build
(powerpc allyesconfig) failed like this:
drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
b47s->window = ioremap_cache(res->start, resource_size(res));
^
drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
b47s->window = ioremap_cache(res->start, resource_size(res));
^
Caused by commit
57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the wireless-drivers-next tree
From: Kalle Valo @ 2016-07-19 6:30 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-wireless, linux-next, linux-kernel, Rafał Miłecki
In-Reply-To: <20160719160831.79c0303f@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> After merging the wireless-drivers-next tree, today's linux-next build
> (powerpc allyesconfig) failed like this:
>
> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
> b47s->window = ioremap_cache(res->start, resource_size(res));
> ^
> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
> b47s->window = ioremap_cache(res->start, resource_size(res));
> ^
>
> Caused by commit
>
> 57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>
> I have reverted that commit for today.
Thanks, kbuild bot also notified about this.
Rafał, as the merge window is getting really close I would like to
revert this for now and we can reapply it once we the problem is fully
solved. And we can use my pending branch for build testing the patch
with kbuild bot. What do you think?
--
Kalle Valo
^ permalink raw reply
* linux-next: Tree for Jul 19
From: Stephen Rothwell @ 2016-07-19 6:43 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160718:
New tree: perf
The l2-mtd tree gained a build failure so I used the version from
next-20160718.
The crypto tree gained a conflict against the fsl tree.
The wireless-drivers-next tree gained a build failure for which I reverted
a commit.
The drm tree gained conflicts against the v4l-dvb tree.
The perf tree inherited a build failure from the tip tree, so I applied
the same fix patch.
The akpm tree lost a patch that turned up elsewhere.
Non-merge commits (relative to Linus' tree): 10256
9534 files changed, 510574 insertions(+), 184291 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 239 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 (47ef4ad2684d Merge tag 'for-linus-20160715' of git://git.infradead.org/linux-mtd)
Merging fixes/master (5edb56491d48 Linux 4.7-rc3)
Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables)
Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled)
Merging arm-current/fixes (f6492164ecb1 ARM: 8577/1: Fix Cortex-A15 798181 errata initialization)
Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (bfa37087aa04 powerpc: Initialise pci_io_base as early as possible)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (8e6ce7ebeb34 net: cavium: liquidio: Avoid dma_unmap_single on uninitialized ndata)
Merging ipsec/master (8e6ce7ebeb34 net: cavium: liquidio: Avoid dma_unmap_single on uninitialized ndata)
Merging netfilter/master (ea43f860d984 Merge branch 'ethoc-fixes')
Merging ipvs/master (3777ed688fba ipvs: fix bind to link-local mcast IPv6 address in backup)
Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git)
Merging mac80211/master (16a910a6722b cfg80211: handle failed skb allocation)
Merging sound-current/for-linus (76df52969711 ALSA: usb-audio: Fix quirks code is not called)
Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code)
Merging driver-core.current/driver-core-linus (92d21ac74a9e Linux 4.7-rc7)
Merging tty.current/tty-linus (a99cde438de0 Linux 4.7-rc6)
Merging usb.current/usb-linus (a99cde438de0 Linux 4.7-rc6)
Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command)
Merging usb-serial-fixes/usb-linus (4c2e07c6a29e Linux 4.7-rc5)
Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm)
Merging staging.current/staging-linus (a99cde438de0 Linux 4.7-rc6)
Merging char-misc.current/char-misc-linus (33688abb2802 Linux 4.7-rc4)
Merging input-current/for-linus (6a5029e66404 Input: ts4800-ts - add missing of_node_put after calling of_parse_phandle)
Merging crypto-current/master (055ddaace035 crypto: user - re-add size check for CRYPTO_MSG_GETALG)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read)
Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API)
Merging drm-intel-fixes/for-linux-next-fixes (ed2eebbd61af drm/i915: add missing condition for committing planes on crtc)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (1ce0b5857f66 ARC: fix linux-next build breakage)
Merging arm/for-next (bf9cb4359182 Merge branches 'component', 'cpuidle', 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (1a695a905c18 Linux 4.7-rc1)
Merging arm-soc/for-next (08686a9fd33e arm-soc: document merge)
Merging amlogic/for-next (4d9b3db03bd4 Merge remote-tracking branch 'clk/clk-s905' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (aa5c0a1e15c2 Merge branch anholt/bcm2835-dt-64-next into for-next)
Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (63a404a3f177 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (eef6bb9fc17a Merge branch 'for_4.8/keystone' into next)
Merging mvebu/for-next (feaf6b0beba8 Merge branch 'mvebu/defconfig64' into mvebu/for-next)
Merging omap/for-next (01eab0a3b919 Merge tag 'omap-for-v4.8/defconfig-v2-signed' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (289f9fb05d0c ARM: dts: msm8916: Add smsm and smp2p nodes)
Merging renesas/next (e1ebb0d1a9a8 Merge branch 'heads/dt-fixes-for-v4.8' into next)
Merging rockchip/for-next (ebbfb5d5627d Merge branch 'v4.8-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (253256f64294 Merge branch 'next/soc' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi
Merging tegra/for-next (6083e0f837ac Merge branch for-4.8/arm64/defconfig into for-next)
Merging arm64/for-next/core (f8d9f924526a arm64: cpuinfo: Expose MIDR_EL1 and REVIDR_EL1 to sysfs)
CONFLICT (content): Merge conflict in arch/arm64/mm/fault.c
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (70f4f9352317 ia64: efi: use timespec64 for persistent clock)
Merging m68k/for-next (86a8280a7fe0 m68k: Assorted spelling fixes)
Merging m68knommu/for-next (33688abb2802 Linux 4.7-rc4)
Merging metag/for-next (fb2bb461e2d8 metag: Remove duplicate KERN_<LEVEL> prefix)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (d117d8edaf68 Merge branch '4.7-fixes' into mips-for-linux-next)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging powerpc/next (b275bfb26963 powerpc/mm/radix: Add a kernel command line to disable radix)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (9f595fd8b548 powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (64a40c84001e s390/pci: Delete an unnecessary check before the function call "pci_dev_put")
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (893d66192c46 tile: support gcc 7 optimization to use __multi3)
Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7)
Merging btrfs-kdave/for-next (701aa322c418 Fixup: fs_info/root cleanups and qgroups patches)
Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache)
Merging cifs/for-next (8d9535b6efd8 cifs: Check for existing directory when opening file with O_CREAT)
Merging configfs/for-next (3dc3afadeb04 configfs: don't set buffer_needs_fill to zero if show() returns error)
Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it)
Merging ext3/for_next (e008bb6134a6 quota: use time64_t internally)
Merging ext4/dev (7bc949164511 ext4: verify extent header depth)
Merging f2fs/dev (363cad7f7e58 f2fs: avoid memory allocation failure due to a long length)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (7879c4e58b7c fuse: improve aio directIO write performance for size extending writes)
Merging gfs2/for-next (44f52122a220 GFS2: Check rs_free with rd_rsspin protection)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (ad94b17810e9 Merge branch 'nfs-rdma')
Merging nfsd/nfsd-next (96c35631204c SUNRPC: change UDP socket space reservation)
Merging orangefs/for-next (78fee0b6846f orangefs: fix namespace handling)
Merging overlayfs/overlayfs-next (d0aa2f16eb2d fsnotify: support overlayfs)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4ac1c17b2044 UBIFS: Implement ->migratepage())
Merging xfs/for-next (f477cedc4e79 Merge branch 'xfs-4.8-misc-fixes-2' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (b223f4e215b3 Merge branch 'd_real' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into work.misc)
CONFLICT (content): Merge conflict in fs/nfs/dir.c
Merging pci/next (e0af5a975e77 Merge branch 'pci/resource' into next)
CONFLICT (content): Merge conflict in drivers/pci/host/pci-tegra.c
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging pstore/for-next/pstore (35da60941e44 pstore/ram: add Device Tree bindings)
Merging hid/for-next (de1bcd764ea0 Merge branch 'for-4.8/upstream' into for-next)
Merging i2c/i2c/for-next (b219554db314 Merge branch 'i2c/for-4.8' into i2c/for-next)
Merging jdelvare-hwmon/master (18c358ac5e32 Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (fa4119e40f2d hwmon: (jc42) Add support for generic JC-42.4 devicetree binding)
Merging v4l-dvb/master (7df7922fa649 Merge branch 'topic/docs-next' into to_next)
Merging pm/linux-next (15ad7523a30a Merge branches 'pm-devfreq' and 'pm-cpu' into linux-next)
CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (2c5ce98e1e83 thermal: sysfs: add comments describing locking strategy)
Merging thermal-soc/next (9a1d2bd3e7fd Merge branch 'work-fixes' into work-next)
CONFLICT (add/add): Merge conflict in drivers/thermal/thermal_sysfs.c
CONFLICT (add/add): Merge conflict in drivers/thermal/thermal_helpers.c
CONFLICT (content): Merge conflict in drivers/thermal/thermal_core.c
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (b1a4e336d500 Merge branch 'topic/dmaengine_cleanups' into next)
Merging net-next/master (2186f6eec273 net: ethernet: marvell: pxa168_eth: use phy_ethtool_{get|set}_link_ksettings)
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/i40e/i40e_main.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec.h
CONFLICT (content): Merge conflict in drivers/net/ethernet/cavium/liquidio/lio_main.c
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2-svk.dts
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging netfilter-next/master (3101e0fc1f6e netfilter: conntrack: protect early_drop by rcu read lock)
Merging ipvs-next/master (be2cef49904b ipvs: count pre-established TCP states as active)
Merging wireless-drivers-next/master (cf8c581a0081 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (e7acf43024e9 Bluetooth: btmrvl: reset is_suspending flag in failure path)
Merging mac80211-next/master (7d27a0ba7adc cfg80211: Add mesh peer AID setting API)
Merging rdma/for-next (fb92d8fb1b9c Merge branches 'cxgb4-4.8', 'mlx5-4.8' and 'fw-version' into k.o/for-4.8)
Merging rdma-leon/rdma-next (4c2e07c6a29e Linux 4.7-rc5)
Merging rdma-leon-test/testing/rdma-next (92d21ac74a9e Linux 4.7-rc7)
Merging mtd/master (7ce9ea7e6b35 mtd: nand: omap2: Add check for old elm binding)
Merging l2-mtd/master (f78921b9020c mtd: mtk-nor: remove duplicated include from mtk-quadspi.c)
$ git reset --hard HEAD^
Merging next-20160718 version of l2-mtd
Merging nand/nand/next (8490c03bd9d4 mtd: nand: jz4780: Update MODULE_AUTHOR email address)
Merging crypto/master (c6335cbb0486 crypto: nx - off by one bug in nx_of_update_msc())
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Merging drm/drm-next (2d635fded22b Merge tag 'drm-vc4-next-2016-07-15' of https://github.com/anholt/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/media/platform/omap/omap_voutdef.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/sti/sti_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/rockchip/rockchip_drm_drv.c
CONFLICT (content): Merge conflict in Documentation/index.rst
Applying: drm/i915/opregion: fix up for argument change
Merging drm-panel/drm/panel/for-next (9bb34c4c730d drm/panel: simple: Add support for Starry KR122EA0SRA panel)
Merging drm-intel/for-linux-next (b224c4dc70cd drm/i915: Unbreak interrupts on pre-gen6)
Merging drm-tegra/drm/tegra/for-next (64ea25c3bc86 drm/tegra: sor: Reject HDMI 2.0 modes)
Merging drm-misc/topic/drm-misc (a026df4c5fa6 dma-buf: Release module reference on creation failure)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (0a677125d0ff drm/msm: Delete an unnecessary check before drm_gem_object_unreference())
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.c
Merging hdlcd/for-upstream/hdlcd (f6c68b4bd4a9 drm: hdlcd: Add information about the underlying framebuffers in debugfs)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (25d6a931b3f3 Merge branches 'sunxi/clk-fixes-for-4.7', 'sunxi/defconfig-for-4.8', 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.8' into sunxi/for-next)
Merging kbuild/for-next (53af10835c6d Merge branch 'kbuild/kbuild' into kbuild/for-next)
Applying: gcc-plugins: disable under COMPILE_TEST
Merging kspp/for-next/kspp (b68ec830f205 mm: SLUB hardened usercopy support)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/arm64/include/asm/uaccess.h
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (efeb1a3ab91d Merge remote-tracking branches 'regmap/topic/bulk', 'regmap/topic/i2c', 'regmap/topic/iopoll', 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next)
Merging sound/for-next (275353bb684e ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members)
Merging sound-asoc/for-next (280d785f6903 Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc-next)
Merging modules/modules-next (9fc3d73bedc7 module: Do a WARN_ON_ONCE() for assert module mutex not held)
Merging input/next (0bb11e969f53 Input: pixcir_ts - add support for axis inversion / swapping)
Merging block/for-next (3868d6b735ce Merge branch 'for-4.8/core' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (modify/delete): fs/ext4/crypto.c deleted in HEAD and modified in block/for-next. Version block/for-next of fs/ext4/crypto.c left in tree.
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in fs/btrfs/compression.c
CONFLICT (content): Merge conflict in drivers/block/xen-blkfront.c
CONFLICT (content): Merge conflict in block/blk-lib.c
$ git rm -f fs/ext4/crypto.c
Merging lightnvm/for-next (191d684c5d4f Merge branch 'for-4.8/drivers' into for-next)
Merging device-mapper/for-next (4d72d8cc3979 dm: allow bio-based table to be upgraded to bio-based with DAX support)
CONFLICT (content): Merge conflict in include/linux/blkdev.h
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (597155a08d69 Merge branch 'fixes' into next)
Merging md/for-next (d787be4092e2 md: reduce the number of synchronize_rcu() calls when multiple devices fail.)
CONFLICT (content): Merge conflict in drivers/md/raid10.c
CONFLICT (content): Merge conflict in drivers/md/raid1.c
Merging mfd/for-mfd-next (f37be01e6dc6 mfd: qcom_rpm: Parametrize also ack selector size)
Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator)
Merging battery/master (4fcd504edbf7 power: reset: add reboot mode driver)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (564bd187dbe2 Merge remote-tracking branches 'regulator/topic/qcom-spmi', 'regulator/topic/rn5t618', 'regulator/topic/tps65218' and 'regulator/topic/twl' into regulator-next)
Merging security/next (d4d03f74a73f apparmor: fix arg_size computation for when setprocattr is null terminated)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging integrity/next (544e1cea03e6 ima: extend the measurement entry specific pcr)
Merging keys/keys-next (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3f09354ac84c netlabel: Implement CALIPSO config functions for SMACK.)
Merging tpmdd/next (f786b7520982 tpm_crb: fix address space of the return pointer in crb_map_res())
Merging watchdog/master (c7ef68c32265 watchdog: tangox: Set max_hw_heartbeat_ms instead of max_timeout)
Merging iommu/next (a9f890f46e6a Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/rockchip', 'arm/smmu' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/iommu/mtk_iommu.c
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (05f0c03fbac1 vfio-pci: Allow to mmap sub-page MMIO BARs if the mmio page is exclusive)
Merging jc_docs/docs-next (e7ca311e376c kernel-doc: Fix up warning output)
Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
Merging audit/next (0b7a0fdb2971 audit: fix whitespace in CWD record)
CONFLICT (content): Merge conflict in arch/s390/kernel/ptrace.c
Merging devicetree/for-next (1d1bde550ea3 of: fdt: mark unflattened tree as detached)
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx51.c
CONFLICT (content): Merge conflict in arch/arm/mach-bcm/board_bcm21664.c
CONFLICT (content): Merge conflict in arch/arc/kernel/setup.c
Merging mailbox/mailbox-for-next (9ac3e85a5c5c mailbox: pl320: remove __raw IO)
Merging spi/for-next (eaec6816a60f Merge remote-tracking branches 'spi/topic/topcliff-pch', 'spi/topic/txx9' and 'spi/topic/xilinx' into spi-next)
Merging perf/perf/core (988dd774dcbd perf tests: Add is_printable_array test)
Applying: tools: Simplify __BITS_PER_LONG define
Merging tip/auto-latest (62ec82a4607f Merge branch 'smp/hotplug')
CONFLICT (content): Merge conflict in arch/x86/kernel/x86_init.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Applying: clocksource/drivers/clps_711x: fixup for "ARM: clps711x: Switch to MULTIPLATFORM"
Applying: x86/kernel: include spinlock_types.h for missing spinlock_t
Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (a67adb32d941 ARM: dts: Add Arria10 Ethernet EDAC devicetree entry)
Merging irqchip/irqchip/for-next (77d50b17c990 Merge branch 'irqchip/misc' into irqchip/for-next)
Merging ftrace/for-next (78aebca2c955 printk, tracing: Avoiding unneeded blank lines)
Merging rcu/rcu/next (fbbede99476f rcu: don't use modular infrastructure in non-modular code)
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Merging kvm/linux-next (af1bae5497b9 KVM: x86: bump KVM_MAX_VCPU_ID to 1023)
CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c
CONFLICT (content): Merge conflict in arch/s390/mm/gmap.c
CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/idle_book3s.S
CONFLICT (content): Merge conflict in arch/powerpc/kernel/exceptions-64s.S
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/paca.h
Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c
Applying: s390: merge fix up for __diag204 move
Merging kvm-arm/next (40c4f8d27296 arm64: KVM: Clean up a condition)
CONFLICT (modify/delete): virt/kvm/arm/vgic.c deleted in kvm-arm/next and modified in HEAD. Version HEAD of virt/kvm/arm/vgic.c left in tree.
$ git rm -f virt/kvm/arm/vgic.c
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (fd7bacbca47a KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt)
Merging kvms390/next (9acc317b183f KVM: s390: let ptff intercepts result in cc=3)
Merging xen-tip/linux-next (6ba286ad8457 xen: support runqueue steal time on xen)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in arch/arm/xen/enlighten.c
Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction)
Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads)
Merging drivers-x86/for-next (df2294fb6428 intel_pmc_core: Convert to DEFINE_DEBUGFS_ATTRIBUTE)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (9c99e5e51988 HSI: omap_ssi: drop pm_runtime_irq_safe)
Merging leds/for-next (d966c943e4db leds: LED driver for TI LP3952 6-Channel Color LED)
Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init)
Merging driver-core/driver-core-next (92d21ac74a9e Linux 4.7-rc7)
Merging tty/tty-next (67417f9c262e Merge 4.7-rc6 into tty-next)
Merging usb/usb-next (a1ca2c6b2924 usb: musb: sunxi: Simplify dr_mode handling)
Applying: staging: emxx_udc: allow modular build
Merging usb-gadget/next (15e4292a2d21 usb: renesas_usbhs: protect the CFIFOSEL setting in usbhsg_ep_enable())
Merging usb-serial/usb-next (3161da970d38 USB: serial: use variable for status)
Merging usb-chipidea-next/ci-for-usb-next (ebfad91c5da3 dt-bindings: ci-hdrc-usb2: s/gadget-itc-setting/itc-setting in example)
Merging staging/staging-next (6c71ee3b6157 Merge tag 'iio-for-4.8c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/lloop.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/llite/lloop.c left in tree.
CONFLICT (modify/delete): drivers/staging/android/sync.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/android/sync.h left in tree.
$ git rm -f drivers/staging/lustre/lustre/llite/lloop.c drivers/staging/android/sync.h
Applying: staging/android: merge fix up for sync.h renaming
Merging char-misc/char-misc-next (45c7d71e1675 Merge tag 'lkdtm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-testing)
Merging extcon/extcon-next (27210e4efd52 extcon: Move extcon_get_edev_by_phandle() errors to dbg level)
Merging cgroup/for-next (3a0bc4647bbe Merge branch 'for-4.7-fixes' into for-next)
Merging scsi/for-next (fcbefc3b2bfb scsi: ufs: remove unnecessary goto label)
Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (256a7c5948ae Merge branch 'for-4.8' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging pinctrl/for-next (25af8bfa9693 pinctrl: Add STM32F746 MCU support)
Merging vhost/linux-next (139ab4d4e68b tools/virtio: add noring tool)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (e937b335a738 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (4287d2aea9bf MAINTAINERS: Add INTEL MERRIFIELD GPIO entry)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (9637e7e0403a Merge branch 'for-4.8/regulator' into for-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (81754357770e fs: Update i_[ug]id_(read|write) to translate relative to s_user_ns)
CONFLICT (content): Merge conflict in fs/proc/root.c
CONFLICT (content): Merge conflict in fs/posix_acl.c
Applying: proc: fixup for "prevent stacking filesystems on top"
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (149f9e734f8d Merge branch 'clk-s905' into clk-next)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (cde07f453bed selftests: media_tests - Add media_device_open to .gitignore)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (0866b6c0964f coresight: Use local coresight_desc instances)
Merging rtc/rtc-next (6785b3b60be1 rtc: fix a typo and reduce three empty lines to one)
CONFLICT (content): Merge conflict in arch/x86/platform/efi/efi_64.c
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (57f6c2d8d4aa Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next)
CONFLICT (content): Merge conflict in drivers/nvdimm/pmem.c
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
[master 52bed7ddf8bd] Revert "bcma: allow enabling serial flash support on non-MIPS SoCs"
Merging akpm-current/current (bb51d6b889b4 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in mm/page_alloc.c
CONFLICT (content): Merge conflict in include/linux/thread_info.h
CONFLICT (modify/delete): arch/arm/configs/bcm_defconfig deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/arm/configs/bcm_defconfig left in tree.
$ git rm -f arch/arm/configs/bcm_defconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: kernel/trace/bpf_trace.c: work around gcc-4.4.4 anon union initialization bug
Applying: drivers/fpga/Kconfig: fix build failure
Applying: tree-wide: replace config_enabled() with IS_ENABLED()
Applying: include/linux/bitmap.h: cleanup
Applying: powerpc: add explicit #include <asm/asm-compat.h> for jump label
Applying: sparc: support static_key usage in non-module __exit sections
Applying: tile: support static_key usage in non-module __exit sections
Applying: arm: jump label may reference text in __exit
Applying: jump_label: remove bug.h, atomic.h dependencies for HAVE_JUMP_LABEL
Applying: dynamic_debug: add jump label support
Applying: ipc/sem.c: Fix complex_count vs. simple op race
Applying: ipc-semc-fix-complex_count-vs-simple-op-race-update
Applying: ipc/sem.c: remove duplicated memory barriers
Applying: ipc/sem: sem_lock with hysteresis
Applying: media: mtk-vcodec: remove unused dma_attrs
Applying: dma-mapping: use unsigned long for dma_attrs
Applying: alpha: dma-mapping: use unsigned long for dma_attrs
Applying: arc: dma-mapping: use unsigned long for dma_attrs
Applying: ARM: dma-mapping: use unsigned long for dma_attrs
Applying: arm64: dma-mapping: use unsigned long for dma_attrs
Applying: avr32: dma-mapping: use unsigned long for dma_attrs
Applying: blackfin: dma-mapping: use unsigned long for dma_attrs
Applying: c6x: dma-mapping: use unsigned long for dma_attrs
Applying: cris: dma-mapping: use unsigned long for dma_attrs
Applying: frv: dma-mapping: use unsigned long for dma_attrs
Applying: drm/exynos: dma-mapping: use unsigned long for dma_attrs
Applying: drm/mediatek: dma-mapping: use unsigned long for dma_attrs
Applying: drm/msm: dma-mapping: use unsigned long for dma_attrs
Applying: drm/nouveau: dma-mapping: use unsigned long for dma_attrs
Applying: drm/rockship: dma-mapping: use unsigned long for dma_attrs
Applying: infiniband: dma-mapping: use unsigned long for dma_attrs
Applying: iommu: dma-mapping: use unsigned long for dma_attrs
Applying: media: dma-mapping: use unsigned long for dma_attrs
Applying: xen: dma-mapping: use unsigned long for dma_attrs
Applying: swiotlb: dma-mapping: use unsigned long for dma_attrs
Applying: powerpc: dma-mapping: use unsigned long for dma_attrs
Applying: video: dma-mapping: use unsigned long for dma_attrs
Applying: x86: dma-mapping: use unsigned long for dma_attrs
Applying: iommu: intel: dma-mapping: use unsigned long for dma_attrs
Applying: h8300: dma-mapping: use unsigned long for dma_attrs
Applying: hexagon: dma-mapping: use unsigned long for dma_attrs
Applying: ia64: dma-mapping: use unsigned long for dma_attrs
Applying: m68k: dma-mapping: use unsigned long for dma_attrs
Applying: metag: dma-mapping: use unsigned long for dma_attrs
Applying: microblaze: dma-mapping: use unsigned long for dma_attrs
Applying: mips: dma-mapping: use unsigned long for dma_attrs
Applying: mn10300: dma-mapping: use unsigned long for dma_attrs
Applying: nios2: dma-mapping: use unsigned long for dma_attrs
Applying: openrisc: dma-mapping: use unsigned long for dma_attrs
Applying: parisc: dma-mapping: use unsigned long for dma_attrs
Applying: misc: mic: dma-mapping: use unsigned long for dma_attrs
Applying: s390: dma-mapping: use unsigned long for dma_attrs
Applying: sh: dma-mapping: use unsigned long for dma_attrs
Applying: sparc: dma-mapping: use unsigned long for dma_attrs
Applying: tile: dma-mapping: use unsigned long for dma_attrs
Applying: unicore32: dma-mapping: use unsigned long for dma_attrs
Applying: xtensa: dma-mapping: use unsigned long for dma_attrs
Applying: remoteproc: qcom: use unsigned long for dma_attrs
Applying: dma-mapping: remove dma_get_attr
Applying: dma-mapping: document the DMA attributes next to the declaration
Merging akpm/master (5df6129426f7 dma-mapping: document the DMA attributes next to the declaration)
^ permalink raw reply
* Re: linux-next: build failure after merge of the wireless-drivers-next tree
From: Rafał Miłecki @ 2016-07-19 6:51 UTC (permalink / raw)
To: Kalle Valo, Brian Norris, linux-mtd@lists.infradead.org
Cc: Stephen Rothwell, linux-wireless@vger.kernel.org, linux-next,
Linux Kernel Mailing List
In-Reply-To: <8760s2w369.fsf@kamboji.qca.qualcomm.com>
On 19 July 2016 at 08:30, Kalle Valo <kvalo@codeaurora.org> wrote:
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
>> After merging the wireless-drivers-next tree, today's linux-next build
>> (powerpc allyesconfig) failed like this:
>>
>> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
>> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
>> b47s->window = ioremap_cache(res->start, resource_size(res));
>> ^
>> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>> b47s->window = ioremap_cache(res->start, resource_size(res));
>> ^
>>
>> Caused by commit
>>
>> 57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>>
>> I have reverted that commit for today.
>
> Thanks, kbuild bot also notified about this.
>
> Rafał, as the merge window is getting really close I would like to
> revert this for now and we can reapply it once we the problem is fully
> solved. And we can use my pending branch for build testing the patch
> with kbuild bot. What do you think?
The simplest fix sounds pretty much as simple as the revert. In the
seconds thread I was considering two fixes: switching to memremap and
adding depends on.
What about trying a simple "depends on"?
--
Rafał
^ permalink raw reply
* Re: linux-next: build failure after merge of the wireless-drivers-next tree
From: Kalle Valo @ 2016-07-19 7:09 UTC (permalink / raw)
To: Rafał Miłecki
Cc: Brian Norris, linux-mtd@lists.infradead.org, Stephen Rothwell,
linux-wireless@vger.kernel.org, linux-next,
Linux Kernel Mailing List
In-Reply-To: <CACna6rxVFD1MpAEYP_Zd4W8CvgnxSQpa0wJs83jwDJ5v11gZ=Q@mail.gmail.com>
Rafał Miłecki <zajec5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> writes:
> On 19 July 2016 at 08:30, Kalle Valo <kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> wrote:
>> Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> writes:
>>
>>> After merging the wireless-drivers-next tree, today's linux-next build
>>> (powerpc allyesconfig) failed like this:
>>>
>>> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
>>> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
>>> b47s->window = ioremap_cache(res->start, resource_size(res));
>>> ^
>>> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>>> b47s->window = ioremap_cache(res->start, resource_size(res));
>>> ^
>>>
>>> Caused by commit
>>>
>>> 57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>>>
>>> I have reverted that commit for today.
>>
>> Thanks, kbuild bot also notified about this.
>>
>> Rafał, as the merge window is getting really close I would like to
>> revert this for now and we can reapply it once we the problem is fully
>> solved. And we can use my pending branch for build testing the patch
>> with kbuild bot. What do you think?
>
> The simplest fix sounds pretty much as simple as the revert.
The problem is that I don't have much time, I need to send the pull
request to Dave within next few days. The fix might create other
problems so I'm not enthusiastic about iterating with this patch at the
moment. I think it can wait for 4.9.
--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: linux-next: build failure after merge of the wireless-drivers-next tree
From: Rafał Miłecki @ 2016-07-19 7:11 UTC (permalink / raw)
To: Kalle Valo
Cc: Brian Norris,
linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Stephen Rothwell,
linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-next, Linux Kernel Mailing List
In-Reply-To: <871t2qw1cz.fsf-HodKDYzPHsUD5k0oWYwrnHL1okKdlPRT@public.gmane.org>
On 19 July 2016 at 09:09, Kalle Valo <kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> wrote:
> Rafał Miłecki <zajec5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> writes:
>
>> On 19 July 2016 at 08:30, Kalle Valo <kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> wrote:
>>> Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> writes:
>>>
>>>> After merging the wireless-drivers-next tree, today's linux-next build
>>>> (powerpc allyesconfig) failed like this:
>>>>
>>>> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
>>>> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
>>>> b47s->window = ioremap_cache(res->start, resource_size(res));
>>>> ^
>>>> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>>>> b47s->window = ioremap_cache(res->start, resource_size(res));
>>>> ^
>>>>
>>>> Caused by commit
>>>>
>>>> 57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>>>>
>>>> I have reverted that commit for today.
>>>
>>> Thanks, kbuild bot also notified about this.
>>>
>>> Rafał, as the merge window is getting really close I would like to
>>> revert this for now and we can reapply it once we the problem is fully
>>> solved. And we can use my pending branch for build testing the patch
>>> with kbuild bot. What do you think?
>>
>> The simplest fix sounds pretty much as simple as the revert.
>
> The problem is that I don't have much time, I need to send the pull
> request to Dave within next few days. The fix might create other
> problems so I'm not enthusiastic about iterating with this patch at the
> moment. I think it can wait for 4.9.
I sent a patch seconds ago, you may just take a look at it. If you
still prefer to revert my commit, go ahead.
--
Rafał
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* next-20160719 build: 0 failures 4 warnings (next-20160719)
From: Build bot for Mark Brown @ 2016-07-19 9:51 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160719
Git describe: next-20160719
Commit: d55b4726cc Add linux-next specific files for 20160719
Build Time: 86 min 50 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 4
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allmodconfig
1 warnings 0 mismatches : x86_64-defconfig
3 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 4
3 ../drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but not used [-Wunused-function]
2 ../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/tty/serial/8250/8250_fintek.c:34:0: warning: "IRQ_MODE" redefined
1 ../drivers/misc/lkdtm_usercopy.c:52:15: warning: 'bad_stack' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but not used [-Wunused-function]
../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
x86_64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but not used [-Wunused-function]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../drivers/misc/lkdtm_usercopy.c:52:15: warning: 'bad_stack' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/tty/serial/8250/8250_fintek.c:34:0: warning: "IRQ_MODE" redefined
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but not used [-Wunused-function]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
arm-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: linux-next: manual merge of the pm tree with the i2c tree
From: Rafael J. Wysocki @ 2016-07-19 12:55 UTC (permalink / raw)
To: Wolfram Sang
Cc: Stephen Rothwell, linux-next, linux-kernel, Octavian Purdila,
Jarkko Nikula, Andy Shevchenko, Mika Westerberg
In-Reply-To: <20160719034806.GA1640@katana>
[-- Attachment #1: Type: text/plain, Size: 872 bytes --]
On Tuesday, July 19, 2016 05:48:07 AM Wolfram Sang wrote:
>
> > > Well, not knowing much about ACPI, I just need the conflict resolution
> > > for my latest i2c/for-next and your above branch. If you want to do it,
> > > fine with me. But maybe Jarkko will be back to office on Monday, too.
> >
> > Unfortunately, I don't see how these branches can be merged in a sensible
> > way without adding too much new code into the merge itself.
> >
> > Something needs to be dropped and then rebased and applied again.
>
> Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
> there was also a driver patch making use of the core changes for which I
> requested some updates. Since those did not happen yet (Jarkko on
> holiday?), the core patches alone are not important anyhow.
Thanks a lot!
> Thanks for looking into it!
No problem.
Thanks,
Rafael
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH/RFC] Re: linux-next: build failure after merge of the luto-misc tree
From: Arnaldo Carvalho de Melo @ 2016-07-19 12:54 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Josh Poimboeuf, Andy Lutomirski, Arnaldo Carvalho de Melo,
Peter Zijlstra, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20160719132608.1aa2692a@canb.auug.org.au>
Em Tue, Jul 19, 2016 at 01:26:08PM +1000, Stephen Rothwell escreveu:
> Hi Arnaldo,
>
> On Mon, 18 Jul 2016 21:39:06 -0300 Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> >
> > Em Tue, Jul 19, 2016 at 10:26:29AM +1000, Stephen Rothwell escreveu:
> >
> > > If you have a single patch (or few) relative to yesterday's tip tree,
> > > please send it to me as well and I will apply it as a fix patch if Ingo
> > > doesn't get to pulling in time.
> >
> > [acme@jouet linux]$ git log --pretty=oneline 9fcfcdf3c7b613c0d9536f57587456411b8a4e33..ae3c14a028ed10552803b68276b6833295ba18cf
> > ae3c14a028ed10552803b68276b6833295ba18cf tools: Copy linux/{hash,poison}.h and check for drift
> > 3aa0042769313b720142c0ef8514dac389e14ebe perf tools: Remove include/linux/list.h from perf's MANIFEST
> > de1e17b1d0c81be472039798698b517c8a68b516 tools: Copy the bitops files accessed from the kernel and check for drift
> > ad430729ae00dd63f7dcadbeb638e589bc03b5a3 Remove: kernel unistd*h files from perf's MANIFEST, not used
> > e0643c4e9fdb2e77ab83ca596460e2c9c15728aa perf tools: Remove tools/perf/util/include/linux/const.h
> > 7e3f36411342a54f1981fa97b43550b8406a3d69 perf tools: Remove tools/perf/util/include/asm/byteorder.h
> > 14f0652b4fbebd0b05da36a06b17ac6d4d87a8f8 perf tools: Add missing linux/compiler.h include to perf-sys.h
> >
> > Available on my repo/branch:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/core
> >
> > I don't know exactly how linux-next works, would it be possible to merge in this branch
> > till it gets into tip/perf/core?
>
> OK, I added this to linux-next today (as a temporary measure), but it
> fails the same way. To be clear, I merged the above branch (without
> the rest of the tip tree) and it fails the same way. :-(
>
> It produces these errors (from the x86_64 allmodconfig build):
>
> In file included from /home/sfr/next/next/tools/arch/x86/include/uapi/asm/bitsperlong.h:10:0,
> from /usr/include/asm-generic/int-ll64.h:11,
> from /usr/include/powerpc64le-linux-gnu/asm/types.h:27,
> from /home/sfr/next/next/tools/include/linux/types.h:9,
> from /home/sfr/next/next/tools/include/linux/list.h:4,
> from elf.h:23,
> from elf.c:30:
> /home/sfr/next/next/tools/include/asm-generic/bitsperlong.h:13:2: error: #error Inconsistent word size. Check asm/bitsperlong.h
> #error Inconsistent word size. Check asm/bitsperlong.h
> ^
>
> (and more similar).
>
> I have applied my patch from yesterday ("tools: Simplify
> __BITS_PER_LONG define"), and will continue on.
Ok, I'm trying the other way around, i.e. building a ppc64 kernel on a
x86_64 machine, that is one setup I have access to easily.
- Arnaldo
^ permalink raw reply
* Re: linux-next: build failure after merge of the wireless-drivers-next tree
From: Kalle Valo @ 2016-07-19 14:08 UTC (permalink / raw)
To: Rafał Miłecki
Cc: Brian Norris, linux-mtd@lists.infradead.org, Stephen Rothwell,
linux-wireless@vger.kernel.org, linux-next,
Linux Kernel Mailing List
In-Reply-To: <CACna6ry6QgrbUoHuJacmr1EhHZyrwqsXfr51gENvY-0zM9L+3Q@mail.gmail.com>
Rafał Miłecki <zajec5@gmail.com> writes:
> On 19 July 2016 at 09:09, Kalle Valo <kvalo@codeaurora.org> wrote:
>> Rafał Miłecki <zajec5@gmail.com> writes:
>>
>>> On 19 July 2016 at 08:30, Kalle Valo <kvalo@codeaurora.org> wrote:
>>>> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>>>>
>>>>> After merging the wireless-drivers-next tree, today's linux-next build
>>>>> (powerpc allyesconfig) failed like this:
>>>>>
>>>>> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
>>>>> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
>>>>> b47s->window = ioremap_cache(res->start, resource_size(res));
>>>>> ^
>>>>> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>>>>> b47s->window = ioremap_cache(res->start, resource_size(res));
>>>>> ^
>>>>>
>>>>> Caused by commit
>>>>>
>>>>> 57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>>>>>
>>>>> I have reverted that commit for today.
>>>>
>>>> Thanks, kbuild bot also notified about this.
>>>>
>>>> Rafał, as the merge window is getting really close I would like to
>>>> revert this for now and we can reapply it once we the problem is fully
>>>> solved. And we can use my pending branch for build testing the patch
>>>> with kbuild bot. What do you think?
>>>
>>> The simplest fix sounds pretty much as simple as the revert.
>>
>> The problem is that I don't have much time, I need to send the pull
>> request to Dave within next few days. The fix might create other
>> problems so I'm not enthusiastic about iterating with this patch at the
>> moment. I think it can wait for 4.9.
>
> I sent a patch seconds ago, you may just take a look at it. If you
> still prefer to revert my commit, go ahead.
Ok, let's try your fix. We still have few days. I applied the patch[1]
to the pending branch this morning and if I don't see any errors I apply
it later tonight and hopefully it will be in tomorrow's linux-next
build. Thanks for the quick fix, very much appreciated.
[1] "mtd: add arch dependency for MTD_BCM47XXSFLASH symbol"
https://patchwork.kernel.org/patch/9236053/
--
Kalle Valo
^ permalink raw reply
* Re: [PATCH/RFC] Re: linux-next: build failure after merge of the luto-misc tree
From: Arnaldo Carvalho de Melo @ 2016-07-19 17:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Josh Poimboeuf, Andy Lutomirski, Arnaldo Carvalho de Melo,
Peter Zijlstra, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20160719125443.GL2207@kernel.org>
Em Tue, Jul 19, 2016 at 09:54:43AM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Tue, Jul 19, 2016 at 01:26:08PM +1000, Stephen Rothwell escreveu:
> > On Mon, 18 Jul 2016 21:39:06 -0300 Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> > > Em Tue, Jul 19, 2016 at 10:26:29AM +1000, Stephen Rothwell escreveu:
> > > > If you have a single patch (or few) relative to yesterday's tip tree,
> > > > please send it to me as well and I will apply it as a fix patch if Ingo
> > > > doesn't get to pulling in time.
> > > [acme@jouet linux]$ git log --pretty=oneline 9fcfcdf3c7b613c0d9536f57587456411b8a4e33..ae3c14a028ed10552803b68276b6833295ba18cf
> > > ae3c14a028ed10552803b68276b6833295ba18cf tools: Copy linux/{hash,poison}.h and check for drift
> > > 3aa0042769313b720142c0ef8514dac389e14ebe perf tools: Remove include/linux/list.h from perf's MANIFEST
> > > de1e17b1d0c81be472039798698b517c8a68b516 tools: Copy the bitops files accessed from the kernel and check for drift
> > > ad430729ae00dd63f7dcadbeb638e589bc03b5a3 Remove: kernel unistd*h files from perf's MANIFEST, not used
> > > e0643c4e9fdb2e77ab83ca596460e2c9c15728aa perf tools: Remove tools/perf/util/include/linux/const.h
> > > 7e3f36411342a54f1981fa97b43550b8406a3d69 perf tools: Remove tools/perf/util/include/asm/byteorder.h
> > > 14f0652b4fbebd0b05da36a06b17ac6d4d87a8f8 perf tools: Add missing linux/compiler.h include to perf-sys.h
> > > Available on my repo/branch:
> > > git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/core
> > >
> > > I don't know exactly how linux-next works, would it be possible to merge in this branch
> > > till it gets into tip/perf/core?
> >
> > OK, I added this to linux-next today (as a temporary measure), but it
> > fails the same way. To be clear, I merged the above branch (without
> > the rest of the tip tree) and it fails the same way. :-(
> >
> > It produces these errors (from the x86_64 allmodconfig build):
> >
> > In fVile included from /home/sfr/next/next/tools/arch/x86/include/uapi/asm/bitsperlong.h:10:0,
> > from /usr/include/asm-generic/int-ll64.h:11,
> > from /usr/include/powerpc64le-linux-gnu/asm/types.h:27,
> > from /home/sfr/next/next/tools/include/linux/types.h:9,
> > from /home/sfr/next/next/tools/include/linux/list.h:4,
> > from elf.h:23,
> > from elf.c:30:
> > /home/sfr/next/next/tools/include/asm-generic/bitsperlong.h:13:2: error: #error Inconsistent word size. Check asm/bitsperlong.h
> > #error Inconsistent word size. Check asm/bitsperlong.h
> > ^
> >
> > (and more similar).
> >
> > I have applied my patch from yesterday ("tools: Simplify
> > __BITS_PER_LONG define"), and will continue on.
>
> Ok, I'm trying the other way around, i.e. building a ppc64 kernel on a
> x86_64 machine, that is one setup I have access to easily.
No such luck, everything works as expected, objtool doesn't even get
compiled, likely it doesn't support powerpc binaries so it isn't built:
$ make -j4 O=../build/ppc-v4.7.0-rc5+/ ARCH=powerpc CROSS_COMPILE=ppc64-linux-gnu- allmodconfig
$ make -j4 O=../build/ppc-v4.7.0-rc5+/ ARCH=powerpc CROSS_COMPILE=ppc64-linux-gnu-
<SNIP>
IHEX2FW firmware/keyspan_pda/xircom_pgs.fw
IHEX firmware/cpia2/stv0672_vp4.bin
IHEX firmware/yam/1200.bin
IHEX firmware/yam/9600.bin
make[1]: Leaving directory '/home/acme/git/build/ppc-v4.7.0-rc5+'
[acme@jouet linux]$
[acme@jouet linux]$ file ../build/ppc-v4.7.0-rc5+/vmlinux
../build/ppc-v4.7.0-rc5+/vmlinux: ELF 64-bit MSB executable, 64-bit PowerPC or cisco 7500, version 1 (SYSV), statically linked, BuildID[sha1]=eeb5449106c3dd7f803a611449f2deaf792d5312, not stripped
cross compiling to x86-32 bits from x86-64 also works :-\
/me scratches head
Probably it got the local definition of bitsperlong.h, i.e. the size on the host build
and then comparing it against the one for the target host...
Anyway, can you try the patch below to see what value is landing on __BITS_PER_LONG?
diff --git a/tools/include/asm-generic/bitsperlong.h b/tools/include/asm-generic/bitsperlong.h
index 45eca517efb3..c8f971e0d6a1 100644
--- a/tools/include/asm-generic/bitsperlong.h
+++ b/tools/include/asm-generic/bitsperlong.h
@@ -10,6 +10,9 @@
#endif
#if BITS_PER_LONG != __BITS_PER_LONG
+#include <linux/stringify.h>
+#pragma message "BITS_PER_LONG=" __stringify(BITS_PER_LONG)
+#pragma message "__BITS_PER_LONG=" __stringify(__BITS_PER_LONG)
#error Inconsistent word size. Check asm/bitsperlong.h
#endif
^ permalink raw reply related
* Re: linux-next: build failure after merge of the wireless-drivers-next tree
From: Brian Norris @ 2016-07-19 18:39 UTC (permalink / raw)
To: Kalle Valo
Cc: Rafał Miłecki, linux-mtd@lists.infradead.org,
Stephen Rothwell, linux-wireless@vger.kernel.org, linux-next,
Linux Kernel Mailing List
In-Reply-To: <87h9blvhxg.fsf@kamboji.qca.qualcomm.com>
Just to head this off, since I noticed it...
On Tue, Jul 19, 2016 at 05:08:59PM +0300, Kalle Valo wrote:
> Rafał Miłecki <zajec5@gmail.com> writes:
> > I sent a patch seconds ago, you may just take a look at it. If you
> > still prefer to revert my commit, go ahead.
>
> Ok, let's try your fix. We still have few days. I applied the patch[1]
> to the pending branch this morning and if I don't see any errors I apply
> it later tonight and hopefully it will be in tomorrow's linux-next
> build. Thanks for the quick fix, very much appreciated.
>
> [1] "mtd: add arch dependency for MTD_BCM47XXSFLASH symbol"
> https://patchwork.kernel.org/patch/9236053/
I applied a trivial change to this same Kconfig entry:
Subject: mtd: update description of MTD_BCM47XXSFLASH symbol
http://git.infradead.org/l2-mtd.git/commitdiff/0a526341fee054c1e2b9f0e4b2b424ae81707d4c
It's a trivial conflict, so should we just let Linus work it out? I can
note it my MTD pull request, if wireless lands first.
Brian
^ permalink raw reply
* Re: [PATCH/RFC] Re: linux-next: build failure after merge of the luto-misc tree
From: Stephen Rothwell @ 2016-07-19 23:21 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Josh Poimboeuf, Andy Lutomirski, Arnaldo Carvalho de Melo,
Peter Zijlstra, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20160719174551.GM2207@kernel.org>
Hi Arnaldo,
On Tue, 19 Jul 2016 14:45:51 -0300 Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
>
> No such luck, everything works as expected, objtool doesn't even get
> compiled, likely it doesn't support powerpc binaries so it isn't built:
right.
> Probably it got the local definition of bitsperlong.h, i.e. the size on the host build
> and then comparing it against the one for the target host...
>
> Anyway, can you try the patch below to see what value is landing on __BITS_PER_LONG?
>
> diff --git a/tools/include/asm-generic/bitsperlong.h b/tools/include/asm-generic/bitsperlong.h
> index 45eca517efb3..c8f971e0d6a1 100644
> --- a/tools/include/asm-generic/bitsperlong.h
> +++ b/tools/include/asm-generic/bitsperlong.h
> @@ -10,6 +10,9 @@
> #endif
>
> #if BITS_PER_LONG != __BITS_PER_LONG
> +#include <linux/stringify.h>
> +#pragma message "BITS_PER_LONG=" __stringify(BITS_PER_LONG)
> +#pragma message "__BITS_PER_LONG=" __stringify(__BITS_PER_LONG)
> #error Inconsistent word size. Check asm/bitsperlong.h
> #endif
I added those three lines to the file (just in yesterday's linux-next
was easiest) and got this:
/home/sfr/next/next/tools/include/asm-generic/bitsperlong.h:14:9: note: #pragma message: BITS_PER_LONG=(8 * 8)
#pragma message "BITS_PER_LONG=" __stringify(BITS_PER_LONG)
^
/home/sfr/next/next/tools/include/asm-generic/bitsperlong.h:15:9: note: #pragma message: __BITS_PER_LONG=32
#pragma message "__BITS_PER_LONG=" __stringify(__BITS_PER_LONG)
^
(a few times, of course)
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the wireless-drivers-next tree
From: Stephen Rothwell @ 2016-07-19 23:36 UTC (permalink / raw)
To: Brian Norris
Cc: Kalle Valo, Rafał Miłecki,
linux-mtd@lists.infradead.org, linux-wireless@vger.kernel.org,
linux-next, Linux Kernel Mailing List
In-Reply-To: <20160719183913.GA88186@google.com>
Hi Brian,
On Tue, 19 Jul 2016 11:39:13 -0700 Brian Norris <computersforpeace@gmail.com> wrote:
>
> I applied a trivial change to this same Kconfig entry:
>
> Subject: mtd: update description of MTD_BCM47XXSFLASH symbol
> http://git.infradead.org/l2-mtd.git/commitdiff/0a526341fee054c1e2b9f0e4b2b424ae81707d4c
>
> It's a trivial conflict, so should we just let Linus work it out? I can
> note it my MTD pull request, if wireless lands first.
Linus and I should be able to cope. I will send my usual notification today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: [PATCH/RFC] Re: linux-next: build failure after merge of the luto-misc tree
From: Stephen Rothwell @ 2016-07-19 23:53 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Josh Poimboeuf, Andy Lutomirski, Arnaldo Carvalho de Melo,
Peter Zijlstra, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20160720092157.7cd8de65@canb.auug.org.au>
Hi Arnaldo,
On Wed, 20 Jul 2016 09:21:57 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 19 Jul 2016 14:45:51 -0300 Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> >
> > No such luck, everything works as expected, objtool doesn't even get
> > compiled, likely it doesn't support powerpc binaries so it isn't built:
>
> right.
>
> > Probably it got the local definition of bitsperlong.h, i.e. the size on the host build
> > and then comparing it against the one for the target host...
> >
> > Anyway, can you try the patch below to see what value is landing on __BITS_PER_LONG?
> >
> > diff --git a/tools/include/asm-generic/bitsperlong.h b/tools/include/asm-generic/bitsperlong.h
> > index 45eca517efb3..c8f971e0d6a1 100644
> > --- a/tools/include/asm-generic/bitsperlong.h
> > +++ b/tools/include/asm-generic/bitsperlong.h
> > @@ -10,6 +10,9 @@
> > #endif
> >
> > #if BITS_PER_LONG != __BITS_PER_LONG
> > +#include <linux/stringify.h>
> > +#pragma message "BITS_PER_LONG=" __stringify(BITS_PER_LONG)
> > +#pragma message "__BITS_PER_LONG=" __stringify(__BITS_PER_LONG)
> > #error Inconsistent word size. Check asm/bitsperlong.h
> > #endif
>
> I added those three lines to the file (just in yesterday's linux-next
> was easiest) and got this:
>
> /home/sfr/next/next/tools/include/asm-generic/bitsperlong.h:14:9: note: #pragma message: BITS_PER_LONG=(8 * 8)
> #pragma message "BITS_PER_LONG=" __stringify(BITS_PER_LONG)
> ^
> /home/sfr/next/next/tools/include/asm-generic/bitsperlong.h:15:9: note: #pragma message: __BITS_PER_LONG=32
> #pragma message "__BITS_PER_LONG=" __stringify(__BITS_PER_LONG)
> ^
>
> (a few times, of course)
So I applied this:
diff --git a/tools/arch/x86/include/uapi/asm/bitsperlong.h b/tools/arch/x86/include/uapi/asm/bitsperlong.h
index 6e23c543cd80..fd299f5468cb 100644
--- a/tools/arch/x86/include/uapi/asm/bitsperlong.h
+++ b/tools/arch/x86/include/uapi/asm/bitsperlong.h
@@ -4,6 +4,12 @@
#if defined(__x86_64__) && !defined(__ILP32__)
# define __BITS_PER_LONG 64
#else
+#ifndef __x86_64__
+#pragma message "__x86_64__ is not defined"
+#endif
+#ifdef __ILP32__
+#pragma message "__ILP32__ is defined"
+#endif
# define __BITS_PER_LONG 32
#endif
and got this:
/home/sfr/next/next/tools/arch/x86/include/uapi/asm/bitsperlong.h:8:9: note: #pragma message: __x86_64__ is not defined
#pragma message "__x86_64__ is not defined"
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: manual merge of the fsl tree with the arm-soc tree
From: Stephen Rothwell @ 2016-07-20 0:45 UTC (permalink / raw)
To: Scott Wood, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Yangbo Lu, Florian Fainelli
Hi Scott,
Today's linux-next merge of the fsl tree got a conflict in:
drivers/soc/Kconfig
between commit:
34642650e5bc ("soc: Move brcmstb to bcm/brcmstb")
from the arm-soc tree and commit:
82117b4a8897 ("soc: fsl: add GUTS driver for QorIQ platforms")
from the fsl tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/soc/Kconfig
index fe42a2fdf351,7106463f118e..000000000000
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@@ -1,7 -1,8 +1,7 @@@
menu "SOC (System On Chip) specific Drivers"
source "drivers/soc/bcm/Kconfig"
- source "drivers/soc/fsl/qe/Kconfig"
-source "drivers/soc/brcmstb/Kconfig"
+ source "drivers/soc/fsl/Kconfig"
source "drivers/soc/mediatek/Kconfig"
source "drivers/soc/qcom/Kconfig"
source "drivers/soc/rockchip/Kconfig"
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-07-20 2:05 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Konstantin Khlebnikov, Eric Dumazet
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/sch_htb.c
between commit:
338ed9b4de57 ("net_sched: sch_htb: export class backlog in dumps")
from the net tree and commit:
0564bf0afae4 ("net/sched/sch_htb: clamp xstats tokens to fit into 32-bit int")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc net/sched/sch_htb.c
index 052f84d6cc23,91982d9784b3..000000000000
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@@ -1136,18 -1113,22 +1113,24 @@@ static in
htb_dump_class_stats(struct Qdisc *sch, unsigned long arg, struct gnet_dump *d)
{
struct htb_class *cl = (struct htb_class *)arg;
+ struct gnet_stats_queue qs = {
+ .drops = cl->drops,
+ };
__u32 qlen = 0;
- if (!cl->level && cl->un.leaf.q)
+ if (!cl->level && cl->un.leaf.q) {
qlen = cl->un.leaf.q->q.qlen;
+ qs.backlog = cl->un.leaf.q->qstats.backlog;
+ }
- cl->xstats.tokens = PSCHED_NS2TICKS(cl->tokens);
- cl->xstats.ctokens = PSCHED_NS2TICKS(cl->ctokens);
+ cl->xstats.tokens = clamp_t(s64, PSCHED_NS2TICKS(cl->tokens),
+ INT_MIN, INT_MAX);
+ cl->xstats.ctokens = clamp_t(s64, PSCHED_NS2TICKS(cl->ctokens),
+ INT_MIN, INT_MAX);
- if (gnet_stats_copy_basic(d, NULL, &cl->bstats) < 0 ||
+ if (gnet_stats_copy_basic(qdisc_root_sleeping_running(sch),
+ d, NULL, &cl->bstats) < 0 ||
gnet_stats_copy_rate_est(d, NULL, &cl->rate_est) < 0 ||
- gnet_stats_copy_queue(d, NULL, &cl->qstats, qlen) < 0)
+ gnet_stats_copy_queue(d, NULL, &qs, qlen) < 0)
return -1;
return gnet_stats_copy_app(d, &cl->xstats, sizeof(cl->xstats));
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-07-20 2:10 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Willem de Bruijn,
Marcelo Ricardo Leitner
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sctp/input.c
between commit:
c74bfbdba0e8 ("sctp: load transport header after sk_filter")
from the net tree and commit:
3acb50c18d8d ("sctp: delay as much as possible skb_linearize")
from the net-next tree.
I fixed it up (I just used the net-next version) and can carry the fix
as necessary. This is now fixed as far as linux-next is concerned, but
any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging. You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build warning after merge of the wireless-drivers-next tree
From: Stephen Rothwell @ 2016-07-20 2:25 UTC (permalink / raw)
To: Kalle Valo, linux-wireless; +Cc: linux-next, linux-kernel, Eyal Reizer
Hi all,
After merging the wireless-drivers-next tree, today's linux-next build
(x86_64 allmodconfig) produced this warning:
drivers/net/wireless/ti/wlcore/spi.c: In function 'wlcore_probe_of':
drivers/net/wireless/ti/wlcore/spi.c:457:6: warning: unused variable 'ret' [-Wunused-variable]
int ret;
^
Introduced by commit
01efe65aba65 ("wlcore: spi: add wl18xx support")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the l2-mtd tree with the wireless-drivers-next tree
From: Stephen Rothwell @ 2016-07-20 2:31 UTC (permalink / raw)
To: Brian Norris, Kalle Valo, linux-wireless
Cc: linux-next, linux-kernel, Rafał Miłecki
Hi Brian,
Today's linux-next merge of the l2-mtd tree got a conflict in:
drivers/mtd/devices/Kconfig
between commit:
efacc699139e ("mtd: add arch dependency for MTD_BCM47XXSFLASH symbol")
from the wireless-drivers-next tree and commit:
0a526341fee0 ("mtd: update description of MTD_BCM47XXSFLASH symbol")
from the l2-mtd tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/mtd/devices/Kconfig
index 64a248556d29,bf8238fb2e12..000000000000
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@@ -113,8 -113,8 +113,8 @@@ config MTD_SST25
if you want to specify device partitioning.
config MTD_BCM47XXSFLASH
- tristate "R/O support for serial flash on BCMA bus"
+ tristate "Support for serial flash on BCMA bus"
- depends on BCMA_SFLASH
+ depends on BCMA_SFLASH && (MIPS || ARM)
help
BCMA bus can have various flash memories attached, they are
registered by bcma as platform devices. This enables driver for
^ permalink raw reply
* Re: [PATCH/RFC] Re: linux-next: build failure after merge of the luto-misc tree
From: Arnaldo Carvalho de Melo @ 2016-07-20 2:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Josh Poimboeuf, Andy Lutomirski, Arnaldo Carvalho de Melo,
Peter Zijlstra, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20160720095333.3034531c@canb.auug.org.au>
Em Wed, Jul 20, 2016 at 09:53:33AM +1000, Stephen Rothwell escreveu:
> On Wed, 20 Jul 2016 09:21:57 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > On Tue, 19 Jul 2016 14:45:51 -0300 Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> > > #if BITS_PER_LONG != __BITS_PER_LONG
> > > +#include <linux/stringify.h>
> > > +#pragma message "BITS_PER_LONG=" __stringify(BITS_PER_LONG)
> > > +#pragma message "__BITS_PER_LONG=" __stringify(__BITS_PER_LONG)
> > > #error Inconsistent word size. Check asm/bitsperlong.h
> > > #endif
> > I added those three lines to the file (just in yesterday's linux-next
> > was easiest) and got this:
> > /home/sfr/next/next/tools/include/asm-generic/bitsperlong.h:14:9: note: #pragma message: BITS_PER_LONG=(8 * 8)
> > #pragma message "BITS_PER_LONG=" __stringify(BITS_PER_LONG)
> > /home/sfr/next/next/tools/include/asm-generic/bitsperlong.h:15:9: note: #pragma message: __BITS_PER_LONG=32
> > #pragma message "__BITS_PER_LONG=" __stringify(__BITS_PER_LONG)
> > (a few times, of course)
> So I applied this:
> +++ b/tools/arch/x86/include/uapi/asm/bitsperlong.h
> @@ -4,6 +4,12 @@
> #if defined(__x86_64__) && !defined(__ILP32__)
> # define __BITS_PER_LONG 64
> #else
> +#ifndef __x86_64__
> +#pragma message "__x86_64__ is not defined"
> +#endif
> +#ifdef __ILP32__
> +#pragma message "__ILP32__ is defined"
> +#endif
> # define __BITS_PER_LONG 32
> #endif
> and got this:
> /home/sfr/next/next/tools/arch/x86/include/uapi/asm/bitsperlong.h:8:9: note: #pragma message: __x86_64__ is not defined
> #pragma message "__x86_64__ is not defined"
Humm, it seems that the compiler used is not the cross one, but the
native, check if, say, __powerpc__ is defined.
- Arnaldo
^ permalink raw reply
* Re: [PATCH/RFC] Re: linux-next: build failure after merge of the luto-misc tree
From: Andy Lutomirski @ 2016-07-20 2:57 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Stephen Rothwell, Josh Poimboeuf, Arnaldo Carvalho de Melo,
Peter Zijlstra, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20160720025202.GB18962@kernel.org>
On Tue, Jul 19, 2016 at 7:52 PM, Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
> Em Wed, Jul 20, 2016 at 09:53:33AM +1000, Stephen Rothwell escreveu:
>> On Wed, 20 Jul 2016 09:21:57 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> > On Tue, 19 Jul 2016 14:45:51 -0300 Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
>> > > #if BITS_PER_LONG != __BITS_PER_LONG
>> > > +#include <linux/stringify.h>
>> > > +#pragma message "BITS_PER_LONG=" __stringify(BITS_PER_LONG)
>> > > +#pragma message "__BITS_PER_LONG=" __stringify(__BITS_PER_LONG)
>> > > #error Inconsistent word size. Check asm/bitsperlong.h
>> > > #endif
>
>> > I added those three lines to the file (just in yesterday's linux-next
>> > was easiest) and got this:
>
>> > /home/sfr/next/next/tools/include/asm-generic/bitsperlong.h:14:9: note: #pragma message: BITS_PER_LONG=(8 * 8)
>> > #pragma message "BITS_PER_LONG=" __stringify(BITS_PER_LONG)
>
>> > /home/sfr/next/next/tools/include/asm-generic/bitsperlong.h:15:9: note: #pragma message: __BITS_PER_LONG=32
>> > #pragma message "__BITS_PER_LONG=" __stringify(__BITS_PER_LONG)
>
>> > (a few times, of course)
>
>> So I applied this:
>
>> +++ b/tools/arch/x86/include/uapi/asm/bitsperlong.h
>> @@ -4,6 +4,12 @@
>> #if defined(__x86_64__) && !defined(__ILP32__)
>> # define __BITS_PER_LONG 64
>> #else
>> +#ifndef __x86_64__
>> +#pragma message "__x86_64__ is not defined"
>> +#endif
>> +#ifdef __ILP32__
>> +#pragma message "__ILP32__ is defined"
>> +#endif
>> # define __BITS_PER_LONG 32
>> #endif
>
>> and got this:
>
>> /home/sfr/next/next/tools/arch/x86/include/uapi/asm/bitsperlong.h:8:9: note: #pragma message: __x86_64__ is not defined
>> #pragma message "__x86_64__ is not defined"
>
> Humm, it seems that the compiler used is not the cross one, but the
> native, check if, say, __powerpc__ is defined.
>
This is still vdso2c, right? It's a hostprog.
This stuff is utterly screwed up. We're building a hostprog for an
x86_64 kernel cross-compiled from powerpc. We should presumably be
pullng in powerpc's uapi headers for hostprogs because it's a *host*
prog.
--Andy
> - Arnaldo
--
Andy Lutomirski
AMA Capital Management, LLC
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox