* linux-next: manual merge of the kselftest tree with the net-next tree
From: Stephen Rothwell @ 2017-02-16 3:24 UTC (permalink / raw)
To: Shuah Khan, David Miller, Networking
Cc: linux-next, linux-kernel, bamvor.zhangjian@huawei.com,
Mickaël Salaün
Hi Shuah,
Today's linux-next merge of the kselftest tree got a conflict in:
tools/testing/selftests/bpf/Makefile
between commit:
d498f8719a09 ("bpf: Rebuild bpf.o for any dependency update")
from the net-next tree and commit:
88baa78d1f31 ("selftests: remove duplicated all and clean target")
from the kselftest 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 tools/testing/selftests/bpf/Makefile
index c7816fe60feb,058351b0694f..000000000000
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@@ -1,26 -1,7 +1,20 @@@
-CFLAGS += -Wall -O2 -I../../../../usr/include
+LIBDIR := ../../../lib
+BPFOBJ := $(LIBDIR)/bpf/bpf.o
-TEST_GEN_PROGS = test_verifier test_maps test_lru_map
+CFLAGS += -Wall -O2 -lcap -I../../../include/uapi -I$(LIBDIR)
+
- test_objs = test_verifier test_tag test_maps test_lru_map test_lpm_map
++TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map
- TEST_PROGS := $(test_objs) test_kmod.sh
- TEST_FILES := $(test_objs)
+ TEST_PROGS := test_kmod.sh
+.PHONY: all clean force
+
- all: $(test_objs)
-
+# force a rebuild of BPFOBJ when its dependencies are updated
+force:
+
+$(BPFOBJ): force
+ $(MAKE) -C $(dir $(BPFOBJ))
+
+$(test_objs): $(BPFOBJ)
+
include ../lib.mk
-
- clean:
- $(RM) $(test_objs)
^ permalink raw reply
* Re: linux-next: build failure after merge of the net tree
From: Alexei Starovoitov @ 2017-02-16 3:06 UTC (permalink / raw)
To: Stephen Rothwell, David Miller, Networking
Cc: linux-next, linux-kernel, Peter Zijlstra, Ingo Molnar,
Arnaldo Carvalho de Melo, Alexander Shishkin, Joe Stringer,
Jiri Olsa
In-Reply-To: <20170216140215.69d39914@canb.auug.org.au>
On 2/15/17 7:02 PM, Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 14 Feb 2017 09:12:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the net tree, today's linux-next build (powerpc64le perf)
>> failed like this:
>>
>> Warning: tools/include/uapi/linux/bpf.h differs from kernel
>> bpf.c: In function 'bpf_prog_attach':
>> bpf.c:180:6: error: 'union bpf_attr' has no member named 'attach_flags'; did you mean 'map_flags'?
>> attr.attach_flags = flags;
>> ^
>>
>> Caused by commit
>>
>> 7f677633379b ("bpf: introduce BPF_F_ALLOW_OVERRIDE flag")
>>
>
> So do we have a fix for this? I am sure that Dave would like to send
> his "net" tree to Linus sometime soonish ...
Do you mind resending it to netdev with my Ack ?
please mention [PATCH net] in subj, so it's get caught by Dave's scripts.
^ permalink raw reply
* Re: linux-next: build failure after merge of the net tree
From: Stephen Rothwell @ 2017-02-16 3:02 UTC (permalink / raw)
To: David Miller, Networking
Cc: linux-next, linux-kernel, Alexei Starovoitov, Peter Zijlstra,
Ingo Molnar, Arnaldo Carvalho de Melo, Alexander Shishkin,
Joe Stringer, Jiri Olsa
In-Reply-To: <20170214091250.57d054b2@canb.auug.org.au>
Hi all,
On Tue, 14 Feb 2017 09:12:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the net tree, today's linux-next build (powerpc64le perf)
> failed like this:
>
> Warning: tools/include/uapi/linux/bpf.h differs from kernel
> bpf.c: In function 'bpf_prog_attach':
> bpf.c:180:6: error: 'union bpf_attr' has no member named 'attach_flags'; did you mean 'map_flags'?
> attr.attach_flags = flags;
> ^
>
> Caused by commit
>
> 7f677633379b ("bpf: introduce BPF_F_ALLOW_OVERRIDE flag")
>
So do we have a fix for this? I am sure that Dave would like to send
his "net" tree to Linus sometime soonish ...
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the mfd tree with the input tree
From: Dmitry Torokhov @ 2017-02-15 19:38 UTC (permalink / raw)
To: Lee Jones
Cc: Stephen Rothwell, linux-next, linux-kernel, Guenter Roeck,
Douglas Anderson
In-Reply-To: <20170214083840.s36lep65kvecoao3@dell>
On Tue, Feb 14, 2017 at 08:38:40AM +0000, Lee Jones wrote:
> On Tue, 14 Feb 2017, Stephen Rothwell wrote:
>
> > Hi Lee,
> >
> > Today's linux-next merge of the mfd tree got a conflict in:
> >
> > drivers/input/keyboard/cros_ec_keyb.c
> >
> > between commits:
> >
> > 2057e15945a8 ("Input: cros_ec_keyb - drop unnecessary call to dev_set_drvdata and other changes")
> > aef01aad89e4 ("Input: matrix-keypad - switch to using generic device properties")
> >
> > from the input tree and commit:
> >
> > cdd7950e7aa4 ("input: cros_ec_keyb: Add non-matrix buttons and switches")
> >
> > from the mfd tree.
> >
> > It looks like the latter introduces a call to dev_get_drvdata(), so I
> > left the dev_set_drvdata() call in.
> >
> > 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.
>
> Morning Stephen,
>
> It looks like Dmitry is yet to pull from:
>
> http://tinyurl.com/ztg68nj
Just pulled and resolved conflicts. Thanks!
--
Dmitry
^ permalink raw reply
* Re: linux-next: manual merge of the kvm tree with the powerpc tree
From: Paolo Bonzini @ 2017-02-15 11:28 UTC (permalink / raw)
To: Michael Ellerman, Stephen Rothwell, Marcelo Tosatti, Gleb Natapov,
KVM, Benjamin Herrenschmidt, PowerPC
Cc: linux-next, linux-kernel, Paul Mackerras, Nicholas Piggin
In-Reply-To: <8760kbln52.fsf@concordia.ellerman.id.au>
On 15/02/2017 12:16, Michael Ellerman wrote:
>> However, the reason was that this is simply not how topic branches
>> should work: topic branches should be the base for other work, they
>> shouldn't contain _all_ the work.
>
> I think that's an overly specific definition of what a topic branch is.
>
> It's just a branch related to some "topic", in this case powerpc kvm,
> where commits can go so they can be shared between two trees.
Right. However, in the specific case of working across maintainers, I
think there is an interest in minimizing the number of files that are
updated in two trees. That limits conflicts.
Typically in x86 land people send a series with generic+KVM patches,
Thomas Gleixner picks the generic ones and places them in a topic branch
that we both pull from. I then apply the KVM patches independently.
It's worth noting that x86 arch maintainers don't care that much about
what's going on in arch/x86/kvm/, and especially they delegate all
testing to me. So I guess that may be the source of the disagreement.
If you would like to unify testing of non-KVM and KVM code for
arch/powerpc, it doesn't make much sense for Paul to send his patches to
me at all. Instead, _I_ should prepare topic branches for Paul whenever
I make sweeping all-arch changes to KVM, that he can include in his pull
requests to you. It'd feel weird though.
Paolo
>> As far as I understand, there was no reason for you to get B1.
>
> Well no reason other than it's ~1300 lines of code in my arch, which I
> would like to go through my normal testing procedures.
^ permalink raw reply
* Re: linux-next: manual merge of the kvm tree with the powerpc tree
From: Michael Ellerman @ 2017-02-15 11:16 UTC (permalink / raw)
To: Paolo Bonzini, Stephen Rothwell, Marcelo Tosatti, Gleb Natapov,
KVM, Benjamin Herrenschmidt, PowerPC
Cc: linux-next, linux-kernel, Paul Mackerras, Nicholas Piggin
In-Reply-To: <4a43b8ed-bd08-f8e8-e749-178bb3bac815@redhat.com>
Paolo Bonzini <pbonzini@redhat.com> writes:
> On 14/02/2017 09:45, Michael Ellerman wrote:
>>> If possible, please pull only up to "powerpc/64: Allow for relocation-on
>>> interrupts from guest to host" and cherry-pick the top two patches
>>> ("powerpc/64: CONFIG_RELOCATABLE support for hmi interrupts" and
>>> "powerpc/powernv: Remove separate entry for OPAL real mode calls") into
>>> your next branch, but leave the rest for my tree only.
>>
>> I don't see how that helps anything.
>>
>> In fact it guarantees a mess because those two commits would now go to
>> Linus via my tree (cherry picked) and via Paul's as part of his second
>> merge of the topic branch.
>>
>> So unless you can give me a good reason I'll merge the tip of the topic
>> branch into my next, as planned.
>
> Yes, Paul's second merge did guarantee a mess, so go ahead.
OK, glad we agree on that.
I've now merged it and most of the conflicts are gone. The one remaining
one will be fixed if you take Paul's second pull, or otherwise it's
trivial for Linus to fix.
> However, the reason was that this is simply not how topic branches
> should work: topic branches should be the base for other work, they
> shouldn't contain _all_ the work.
I think that's an overly specific definition of what a topic branch is.
It's just a branch related to some "topic", in this case powerpc kvm,
where commits can go so they can be shared between two trees.
> So the right workflow would have been:
>
> - Paul submits topic branch A to you
That never existed though. Paul had a series of 20 patches to enable KVM
with the radix MMU.
So to create 'A' he would have to split his series in two. Which he can
obviously do, but it's unnecessary IMHO.
> - you merge A
>
> - Paul merges topic branch A into his "next" branch
>
> - Paul applies KVM-specific patches B1 on top of his "next" branch.
>
> - Paul sends pull request to me (with A + kvmppc work).
Yeah we could have done it that way. But it unnecessarily splits the
series across the trees, and means I have no way of testing the whole in
my tree.
> As far as I understand, there was no reason for you to get B1.
Well no reason other than it's ~1300 lines of code in my arch, which I
would like to go through my normal testing procedures.
I also don't see how it hurts in any way for B1 to go to Linus via both
trees.
> The last two patches (let's call them B2) also didn't need to go through
> the kvm-ppc branch at all. You could have applied them directly on top
> of A.
I'm pretty sure Paul did need the last patch to fix a bug, but maybe
he reworked that code, I forget.
You're right the second last patch didn't need to go via kvm-ppc. I put
it in the topic branch because it was based on earlier patches in there,
but I could have put it in my tree and fixed up the conflict when I
merged the topic branch.
cheers
^ permalink raw reply
* Re: linux-next: manual merge of the kvm tree with the powerpc tree
From: Michael Ellerman @ 2017-02-15 10:52 UTC (permalink / raw)
To: Stephen Rothwell, Marcelo Tosatti, Gleb Natapov, KVM,
Benjamin Herrenschmidt, PowerPC
Cc: linux-next, linux-kernel, Paul Mackerras, Li Zhong
In-Reply-To: <20170215133820.439190c9@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/powerpc/kvm/book3s_hv_rm_xics.c
>
> between commit:
>
> ab9bad0ead9a ("powerpc/powernv: Remove separate entry for OPAL real mode calls")
>
> from the powerpc tree and commit:
>
> 21acd0e4df04 ("KVM: PPC: Book 3S: XICS: Don't lock twice when checking for resend")
>
> from the kvm tree.
Thanks.
That will go away if/when Paolo merges the rest of Paul's next.
cheers
> diff --cc arch/powerpc/kvm/book3s_hv_rm_xics.c
> index 29f43ed6d5eb,0b2e388f4cdf..000000000000
> --- a/arch/powerpc/kvm/book3s_hv_rm_xics.c
> +++ b/arch/powerpc/kvm/book3s_hv_rm_xics.c
> @@@ -35,8 -35,8 +35,8 @@@ int kvm_irq_bypass = 1
> EXPORT_SYMBOL(kvm_irq_bypass);
>
> static void icp_rm_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,
> - u32 new_irq);
> + u32 new_irq, bool check_resend);
> -static int xics_opal_rm_set_server(unsigned int hw_irq, int server_cpu);
> +static int xics_opal_set_server(unsigned int hw_irq, int server_cpu);
>
> /* -- ICS routines -- */
> static void ics_rm_check_resend(struct kvmppc_xics *xics,
^ permalink raw reply
* next-20170215 build: 0 failures 7 warnings (next-20170215)
From: Build bot for Mark Brown @ 2017-02-15 9:23 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170215
Git describe: next-20170215
Commit: fee922e6a9 Add linux-next specific files for 20170215
Build Time: 110 min 54 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 7
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
7 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Warnings Summary: 7
1 ../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../include/linux/device.h:1477:15: warning: passing argument 1 of 'platform_driver_unregister' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../include/linux/device.h:1472:20: warning: passing argument 1 of '__platform_driver_register' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../drivers/iio/adc/rcar-gyroadc.c:429:27: warning: 'num_channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:428:23: warning: 'channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:426:22: warning: 'sample_width' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:398:26: warning: 'adcmode' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
../drivers/iio/adc/rcar-gyroadc.c:429:27: warning: 'num_channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:426:22: warning: 'sample_width' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:428:23: warning: 'channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:398:26: warning: 'adcmode' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/device.h:1472:20: warning: passing argument 1 of '__platform_driver_register' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../include/linux/device.h:1477:15: warning: passing argument 1 of 'platform_driver_unregister' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm64-allmodconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
^ permalink raw reply
* linux-next: Tree for Feb 15
From: Stephen Rothwell @ 2017-02-15 5:49 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20170214:
The net tree still had its build failure for which I applied a fix patch.
The f2fs tree gained a conflict against the fscrypt tree.
The rdma tree gained a build failure due to an interaction with the
net-next tree for which I applied a merge fix patch.
The kvm tree gained a conflict against the powerpc tree.
Non-merge commits (relative to Linus' tree): 8930
9881 files changed, 408543 insertions(+), 185382 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 254 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 (747ae0a96f1a Merge tag 'media/v4.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
Merging arc-current/for-curr (8ba605b607b7 ARC: [plat-*] ARC_HAS_COH_CACHES no longer relevant)
Merging arm-current/fixes (228dbbfb5d77 ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write)
Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (f83e6862047e powerpc/powernv: Properly set "host-ipi" on IPIs)
Merging sparc/master (f9a42e0d58cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (d199fab63c11 packet: fix races in fanout_add())
Merging ipsec/master (c282222a45cb xfrm: policy: init locks early)
Merging netfilter/master (f95d7a46bc57 netfilter: ctnetlink: Fix regression in CTA_HELP processing)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware)
Merging mac80211/master (0c8ef291d976 Merge branch 'rhashtable-allocation-failure-during-insertion')
Merging sound-current/for-linus (af677166cf63 ALSA: hda - adding a new NV HDMI/DP codec ID in the driver)
Merging pci-current/for-linus (d98e0929071e Revert "PCI: pciehp: Add runtime PM support for PCIe hotplug ports")
Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4)
Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4)
Merging usb.current/usb-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
Merging usb-serial-fixes/usb-linus (d07830db1bdb USB: serial: pl2303: add ATEN device ID)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
Merging staging.current/staging-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging char-misc.current/char-misc-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging input-current/for-linus (722c5ac708b4 Input: elan_i2c - add ELAN0605 to the ACPI table)
Merging crypto-current/master (7c2cf1c4615c crypto: chcr - Fix key length for RFC4106)
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
Merging vfio-fixes/for-linus (930a42ded3fe vfio/spapr_tce: Set window when adding additional groups to container)
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
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 (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging v4l-dvb-fixes/fixes (f9c85ee67164 [media] siano: make it work again with CONFIG_VMAP_STACK)
Merging drm-intel-fixes/for-linux-next-fixes (7089db84e356 Linux 4.10-rc8)
Merging drm-misc-fixes/for-linux-next-fixes (49d29a077af8 drm: vc4: adapt to new behaviour of drm_crtc.c)
Applying: bpf: kernel header files need to be copied into the tools directory
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging arm/for-next (0d6cc838f520 Merge branches 'fixes', 'kuser', 'misc' and 'sa1100-base' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (3461b12aebf5 Merge branches 'next/arm64' and 'next/dt64' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
Merging amlogic/for-next (700501d48123 Merge v4.11/dt64)
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
Merging at91/at91-next (e514f82c67c1 Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch '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 (57aba12f97c2 Merge branch 'zte/pm-domains' into for-next)
Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
Merging mvebu/for-next (f8e8eda32b4a Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (44741fc83094 Merge branch 'omap-for-v4.10/fixes' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (a844f941617c Merge tag 'qcom-arm64-for-4.11-2' into final-for-4.11)
Merging renesas/next (59fd3e06b3d7 Merge branches 'arm64-dt-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next)
Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (9689628ec120 Merge branch 'for-v4.11/drivers-soc-exynos-pmu-the-joy-never-ends' into for-next)
Merging tegra/for-next (6ef2dbf97439 Merge branch for-4.11/i2c into for-next)
Merging arm64/for-next/core (38fd94b0275c arm64: Work around Falkor erratum 1003)
Merging clk/clk-next (337072604224 clk: mvebu: Expand mv98dx3236-core-clock support)
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 (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
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 (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (3dfe33020ca8 m68k/sun3: Remove dead code in paging_init())
Merging m68knommu/for-next (73ec49463f89 m68k/defconfig: amcore board defconfig tuning)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (2bc1456e71ff Merge branch 'mips-fixes' into mips-for-linux-next)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (07d7c4560b7a openrisc: head: Init r0 to 0 on start)
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
Merging powerpc/next (da0e7e627696 Merge branch 'topic/ppc-kvm' into next)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (57d7f939e7bd s390: add no-execute support)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6e72293ab0e9 xtensa: fix noMMU build on cores with MMU)
Merging fscrypt/master (b14c8e6afd87 fscrypt: properly declare on-stack completion)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (f0ce4dcacb4e Merge branch 'for-next-next-v4.11-20170214' into for-next-20170214)
Merging ceph/master (6df8c9d80a27 ceph: fix bad endianness handling in parse_reply_info_extra)
Merging cifs/for-next (ae6f8dd4d0c8 CIFS: Allow to switch on encryption with seal mount option)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (6c71100db53e fanotify: simplify the code of fanotify_merge)
Merging ext4/dev (cdd33b941b67 ext4: do not use stripe_with if it is not set)
Merging f2fs/dev (aacf533a90a7 f2fs: super: constify fscrypt_operations structure)
CONFLICT (content): Merge conflict in fs/f2fs/super.c
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (210675270caa fuse: fix time_to_jiffies nsec sanity check)
Merging gfs2/for-next (c548a1c17560 gfs2: Make gfs2_write_full_page static)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging nfsd/nfsd-next (d6fc8821c2d2 SUNRPC/Cache: Always treat the invalid cache as unexpired)
Merging orangefs/for-next (eb68d0324dc4 orangefs: fix buffer size mis-match between kernel space and user space.)
Merging overlayfs/overlayfs-next (51f8f3c4e225 ovl: drop CAP_SYS_RESOURCE from saved mounter's credentials)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
Merging xfs/for-next (4560e78f40cb xfs: don't block the log commit handler for discards)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (bfe219d373ca vfs: wrap write f_ops with file_{start,end}_write())
Merging printk/for-next (d9c23523ed98 printk: drop call_console_drivers() unused param)
Merging pci/next (83a96ebd0efa Merge branch 'pci/host-thunder' into next)
Merging pstore/for-next/pstore (fc1b326efd27 MAINTAINERS: Adjust pstore git repo URI, add files)
Merging hid/for-next (aaffe2b03d64 Merge branch 'for-4.11/intel-ish' into for-next)
Merging i2c/i2c/for-next (ef886d769611 Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (87d08b11b161 devicetree: add lm90 thermal_zone sensor support)
Merging jc_docs/docs-next (c33dea1eda71 Documentation: make Makefile.sphinx no-ops quieter)
Merging v4l-dvb/master (9eeb0ed0f309 [media] mtk-vcodec: fix build warnings without DEBUG)
Merging v4l-dvb-next/master (432ac2d4acef Merge branch 'v4l_for_linus' into to_next)
Merging fbdev/fbdev-for-next (0704916a4b24 video: fbdev: fsl-diu-fb: remove impossible condition)
Merging pm/linux-next (98032088d80f Merge branches 'pm-domains', 'pm-qos' and 'pm-tools' into linux-next)
CONFLICT (content): Merge conflict in arch/mips/configs/lemote2f_defconfig
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (7b09ae6042cd Merge branches 'ida-conversion' and 'for-rc' into next)
Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (675d4d5c03d7 pch_gbe: Omit private ndo_get_stats function)
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging ipsec-next/master (37b103830ec3 xfrm: policy: make policy backend const)
CONFLICT (content): Merge conflict in net/xfrm/xfrm_policy.c
Merging netfilter-next/master (8f9000a565d0 net:ethernet:aquantia: Add 2500/5000 mbit link modes support.)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (3b03cc0783b0 net: natsemi: ns83820: use new api ethtool_{get|set}_link_ksettings)
Merging bluetooth/master (264e6777f958 Merge branch 'netvsc-enhancements')
Merging mac80211-next/master (2194bd108021 net: qcom/emac: fix a sizeof() typo)
Merging rdma/for-next (592e8b3226a2 RDMA/bnxt_re: Add bnxt_re driver build support)
Applying: RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."
Merging mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe())
Merging l2-mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe())
Merging nand/nand/next (a4077ce58713 mtd: nand: Add Winbond manufacturer id)
Merging spi-nor/next (7fa2c7038cc0 mtd: spi-nor: cqspi: remove redundant dead code on error return check)
Merging crypto/master (9d12ba86f818 crypto: brcm - Add Broadcom SPU driver)
Merging drm/drm-next (13f62f54d174 Merge branch 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux into drm-next)
CONFLICT (content): Merge conflict in lib/Kconfig
CONFLICT (content): Merge conflict in include/drm/drm_connector.h
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sprite.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.c
Merging drm-panel/drm/panel/for-next (eaeebffa90f3 drm/panel: simple: Specify bus width and flags for EDT displays)
Merging drm-intel/for-linux-next (05e7866a174f Merge tag 'gvt-next-2017-02-07' of https://github.com/01org/gvt-linux into drm-intel-next-fixes)
Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices)
Merging drm-misc/for-linux-next (2220fc1ab363 uapi: add missing install of dma-buf.h)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (21c42da18ef1 drm/msm: return -EFAULT if copy_from_user() fails)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (83d642ee6dbe drm: mali-dp: fix stride setting for multi-plane formats)
Merging sunxi/sunxi/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging kspp/for-next/kspp (b512bf439c35 usercopy: Add tests for all get_user() sizes)
CONFLICT (content): Merge conflict in include/asm-generic/asm-prototypes.h
CONFLICT (content): Merge conflict in arch/s390/Kconfig.debug
CONFLICT (content): Merge conflict in arch/arm/configs/aspeed_g5_defconfig
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (3fe2cf7eb21a ALSA: x86: Support S16 format)
Merging sound-asoc/for-next (2f3cd7c95623 Merge remote-tracking branches 'asoc/topic/wm8741', 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (91168dd66096 module: fix memory leak on early load_module() failures)
Merging input/next (d0d89493bff8 Input: tsc2004/5 - switch to using generic device properties)
CONFLICT (content): Merge conflict in drivers/input/rmi4/Kconfig
Merging block/for-next (fb2a77e4a25e Merge branch 'for-4.11/block' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Applying: scsi: mpt3sas: fix up for "block: fold cmd_type into the REQ_OP_ space"
Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next)
Merging device-mapper/for-next (f5b0cba8f239 dm crypt: replace RCU read-side section with rwsem)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (006cac826298 Merge branch 'fixes' into next)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (e33fbb9cc73d md/raid5-cache: exclude reclaiming stripes in reclaim check)
Merging mfd/for-mfd-next (e93c10211d03 mfd: lpc_ich: Enable watchdog on Intel Apollo Lake PCH)
CONFLICT (content): Merge conflict in drivers/input/keyboard/cros_ec_keyb.c
Merging backlight/for-backlight-next (80e5d455339a MAINTAINERS: Rework entry for Backlight)
Merging battery/for-next (744cc304a18f power: supply: add AC power supply driver for AXP20X and AXP22X PMICs)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (ef246c9f7041 Merge remote-tracking branches 'regulator/topic/s2mpa01', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next)
Merging security/next (52176603795c KEYS: Use memzero_explicit() for secret data)
Applying: selinux: merge fix for "smc: establish new socket family"
Merging integrity/next (20f482ab9e0f ima: allow to check MAY_APPEND)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (1ea0ce40690d selinux: allow changing labels for cgroupfs)
Merging tpmdd/next (5cec5bacd377 tpm xen: drop unneeded chip variable)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
Merging iommu/next (8d2932dd0634 Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'arm/mediatek', 'arm/core', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (0ca582fd0463 vfio: Replace module request with softdep)
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
Merging audit/next (fe8e52b9b910 audit: remove unnecessary curly braces from switch/case statements)
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (bd0096d7467f of: Add missing space at end of pr_fmt().)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (6a9f69e5b86d Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (5bf728f02218 Merge branch 'x86/platform')
CONFLICT (content): Merge conflict in security/apparmor/include/apparmor.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
Applying: locking/atomic, kref: merge fixup for code movement
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Merging edac-amd/for-next (e62d2ca9d05c EDAC, amd64: Bump driver version)
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
Merging ftrace/for-next (e704eff3ff51 ftrace: Have set_graph_function handle multiple functions in one write)
Merging rcu/rcu/next (31945aa9f140 Merge branches 'doc.2017.01.15b', 'dyntick.2017.01.23a', 'fixes.2017.01.23a', 'srcu.2017.01.25a' and 'torture.2017.01.15b' into HEAD)
Merging kvm/linux-next (8ef81a9a453f KVM: x86: hide KVM_HC_CLOCK_PAIRING on 32 bit)
CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_hv_rm_xics.c
Merging kvm-arm/next (7b6b46311a85 KVM: arm/arm64: Emulate the EL1 phys timer registers)
Merging kvm-mips/next (12ed1faece3f KVM: MIPS: Allow multiple VCPUs to be created)
Merging kvm-ppc/kvm-ppc-next (5982f0849e08 KVM: PPC: Book 3S: Fix error return in kvm_vm_ioctl_create_spapr_tce())
Merging kvms390/next (260a1d6afe2e KVM: s390: log runtime instrumentation enablement)
Merging xen-tip/linux-next (dc9eab6fd94d xen/privcmd: return -ENOTTY for unimplemented IOCTLs)
Merging percpu/for-next (966d2b04e070 percpu-refcount: fix reference leak during percpu-atomic transition)
Merging workqueues/for-next (a45463cbf3f9 workqueue: avoid clang warning)
Merging drivers-x86/for-next (b193d56a3561 platform/x86: intel_mid_powerbtn: Use SCU IPC directly)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (fb3d769173d2 leds: ledtrig-heartbeat: Make top brightness adjustable)
Merging ipmi/for-next (db3b7e134185 char: ipmi: constify ipmi_smi_handlers structures)
Merging driver-core/driver-core-next (17627157cda1 kernfs: handle null pointers while printing node name and path)
Merging usb/usb-next (eff0b85efb2b usb: musb: add code comment for clarification)
Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions)
Merging usb-serial/usb-next (d0c54f2f5be8 USB: serial: upd78f0730: sort device ids)
Merging usb-chipidea-next/ci-for-usb-next (753dfd23612d usb: chipidea: msm: Fix return value check in ci_hdrc_msm_probe())
Merging phy-next/next (0b10f64dbe60 phy: qcom-ufs: Fix misplaced jump label)
Merging tty/tty-next (6d35b131caea tty: Remove extra include in HVC console tty framework)
Merging char-misc/char-misc-next (def95c73567d binder: Add support for file-descriptor arrays)
CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst
Merging extcon/extcon-next (8ea227886002 extcon: arizona: Wait for any running HPDETs to complete on jack removal)
Merging staging/staging-next (3176d60dfbc7 staging:xgifb:vb_setmode.h: Add missing identifier names)
CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_parallel.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_parallel.c left in tree.
$ git rm -f drivers/staging/media/lirc/lirc_parallel.c
Merging slave-dma/next (539f9c4de1b2 Merge branch 'for-linus' into next)
Merging cgroup/for-next (63f1ca59453a Merge branch 'cgroup/for-4.11-rdmacg' into cgroup/for-4.11)
Merging scsi/for-next (ebb0de3d1240 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (156f8759bb70 scsi: megaraid_sas: driver version upgrade)
Merging target-updates/for-next (b2c9652eba6c target: Remove command flag CMD_T_DEV_ACTIVE)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (3d88460dbd28 Merge tag 'drm-fixes-for-v4.10-rc8' of git://people.freedesktop.org/~airlied/linux)
Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (80363894995b virtio_mmio: expose header to userspace)
Merging rpmsg/for-next (96e3485759b7 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (9202ba2397d1 gpio: mockup: implement event injecting over debugfs)
CONFLICT (content): Merge conflict in drivers/staging/greybus/gpio.c
Applying: serial: st-asc: Use new GPIOD API to obtain RTS pin
Merging pinctrl/for-next (2039834c86f3 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (38b0a526ec33 Merge branch 'for-4.11/drivers' into for-next)
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 (fea6d2a610c8 vfs: Use upper filesystem inode in bprm_fill_uid())
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (68bd42d97c30 selftests/powerpc: Fix remaining fallout from recent changes)
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
Merging coresight/next (7f12a0d4a674 coresight: STM: Balance enable/disable)
Merging rtc/rtc-next (b180cf8b0bce rtc: m48t86: add NVRAM support)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (bfb34527a32a libnvdimm, pfn: fix memmap reservation size versus 4K alignment)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging extable/extable (90858794c960 module.h: remove extable.h include now users have migrated)
Merging idr/idr-4.11 (768dd325a382 radix tree test suite: Run iteration tests for longer)
Merging akpm-current/current (1224d22e9f1c scatterlist: do not disable IRQs in sg_copy_buffer)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
CONFLICT (content): Merge conflict in include/linux/kprobes.h
CONFLICT (content): Merge conflict in include/linux/iomap.h
CONFLICT (content): Merge conflict in include/linux/dax.h
CONFLICT (content): Merge conflict in fs/iomap.c
CONFLICT (content): Merge conflict in fs/dax.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
Applying: powerpc/kprobes: fixup for kprobes declarations moving
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs: add i_blocksize()
Applying: truncate: use i_blocksize()
Applying: nilfs2: use nilfs_btree_node_size()
Applying: nilfs2: use i_blocksize()
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: scripts/spelling.txt: add some typo-words
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
Applying: debugobjects: track number of kmem_cache_alloc/kmem_cache_free done
Applying: debugobjects: scale thresholds with # of CPUs
Applying: debugobjects: reduce contention on the global pool_lock
Merging akpm/master (faf1e4d21ed5 debugobjects: reduce contention on the global pool_lock)
^ permalink raw reply
* Re: linux-next: build failure after merge of the rdma tree
From: Selvin Xavier @ 2017-02-15 5:09 UTC (permalink / raw)
To: Doug Ledford
Cc: Stephen Rothwell, David Miller, Networking, linux-next,
linux-kernel, Michael Chan, Eddie Wai, Devesh Sharma,
Somnath Kotur, Sriharsha Basavapatna
In-Reply-To: <ad8c1dc5-9d96-b45f-fe89-115ea4d0174c@redhat.com>
On Wed, Feb 15, 2017 at 6:35 AM, Doug Ledford <dledford@redhat.com> wrote:
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Wed, 15 Feb 2017 11:23:25 +1100
>> Subject: [PATCH] RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Thanks Stephen. I had been forewarned about this by Selvin and I
> instructed him to send me a fixup patch that would resolve the issue. I
> would apply it to my tree before merging with Linus. He just hadn't
> time to send it yet. Your patch is sufficient as well, so I may just
> pull it in. Thanks again.
Thanks Stephen and Doug for taking care of this.
Acked-by: Selvin Xavier <selvin.xavier@broadcom.com>
^ permalink raw reply
* linux-next: manual merge of the kvm tree with the powerpc tree
From: Stephen Rothwell @ 2017-02-15 2:38 UTC (permalink / raw)
To: Marcelo Tosatti, Gleb Natapov, KVM, Michael Ellerman,
Benjamin Herrenschmidt, PowerPC
Cc: linux-next, linux-kernel, Paul Mackerras, Li Zhong
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/kvm/book3s_hv_rm_xics.c
between commit:
ab9bad0ead9a ("powerpc/powernv: Remove separate entry for OPAL real mode calls")
from the powerpc tree and commit:
21acd0e4df04 ("KVM: PPC: Book 3S: XICS: Don't lock twice when checking for resend")
from the kvm 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 arch/powerpc/kvm/book3s_hv_rm_xics.c
index 29f43ed6d5eb,0b2e388f4cdf..000000000000
--- a/arch/powerpc/kvm/book3s_hv_rm_xics.c
+++ b/arch/powerpc/kvm/book3s_hv_rm_xics.c
@@@ -35,8 -35,8 +35,8 @@@ int kvm_irq_bypass = 1
EXPORT_SYMBOL(kvm_irq_bypass);
static void icp_rm_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,
- u32 new_irq);
+ u32 new_irq, bool check_resend);
-static int xics_opal_rm_set_server(unsigned int hw_irq, int server_cpu);
+static int xics_opal_set_server(unsigned int hw_irq, int server_cpu);
/* -- ICS routines -- */
static void ics_rm_check_resend(struct kvmppc_xics *xics,
^ permalink raw reply
* Re: linux-next: build failure after merge of the rdma tree
From: Doug Ledford @ 2017-02-15 1:05 UTC (permalink / raw)
To: Stephen Rothwell, David Miller, Networking
Cc: linux-next, linux-kernel, Michael Chan, Selvin Xavier, Eddie Wai,
Devesh Sharma, Somnath Kotur, Sriharsha Basavapatna
In-Reply-To: <20170215113003.4c730d86@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 3198 bytes --]
On 2/14/2017 7:30 PM, Stephen Rothwell wrote:
> Hi Doug,
>
> After merging the rdma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/infiniband/hw/bnxt_re/main.c: In function 'bnxt_re_net_ring_free':
> drivers/infiniband/hw/bnxt_re/main.c:231:18: error: 'RING_ALLOC_REQ_RING_TYPE_CMPL' undeclared (first use in this function)
> req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
> ^
> drivers/infiniband/hw/bnxt_re/main.c:231:18: note: each undeclared identifier is reported only once for each function it appears in
> drivers/infiniband/hw/bnxt_re/main.c: In function 'bnxt_re_net_ring_alloc':
> drivers/infiniband/hw/bnxt_re/main.c:271:18: error: 'RING_ALLOC_REQ_RING_TYPE_CMPL' undeclared (first use in this function)
> req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
> ^
>
> Caused by commit
>
> 1ac5a4047975 ("RDMA/bnxt_re: Add bnxt_re RoCE driver")
>
> interacting with commit
>
> bac9a7e0f5d6 ("bnxt_en: Update to firmware interface spec 1.7.0.")
>
> from the net-next tree.
>
> I added this merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 15 Feb 2017 11:23:25 +1100
> Subject: [PATCH] RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Thanks Stephen. I had been forewarned about this by Selvin and I
instructed him to send me a fixup patch that would resolve the issue. I
would apply it to my tree before merging with Linus. He just hadn't
time to send it yet. Your patch is sufficient as well, so I may just
pull it in. Thanks again.
> ---
> drivers/infiniband/hw/bnxt_re/main.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
> index 6b9f1178050f..bd452a92b386 100644
> --- a/drivers/infiniband/hw/bnxt_re/main.c
> +++ b/drivers/infiniband/hw/bnxt_re/main.c
> @@ -228,7 +228,7 @@ static int bnxt_re_net_ring_free(struct bnxt_re_dev *rdev, u16 fw_ring_id,
> }
>
> bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_RING_FREE, -1, -1);
> - req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
> + req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
> req.ring_id = cpu_to_le16(fw_ring_id);
> bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
> sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
> @@ -268,7 +268,7 @@ static int bnxt_re_net_ring_alloc(struct bnxt_re_dev *rdev, dma_addr_t *dma_arr,
> /* Association of ring index with doorbell index and MSIX number */
> req.logical_id = cpu_to_le16(map_index);
> req.length = cpu_to_le32(ring_mask + 1);
> - req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
> + req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
> req.int_mode = RING_ALLOC_REQ_INT_MODE_MSIX;
> bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
> sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
>
--
Doug Ledford <dledford@redhat.com>
GPG Key ID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the rdma tree
From: Stephen Rothwell @ 2017-02-15 0:30 UTC (permalink / raw)
To: Doug Ledford, David Miller, Networking
Cc: linux-next, linux-kernel, Michael Chan, Selvin Xavier, Eddie Wai,
Devesh Sharma, Somnath Kotur, Sriharsha Basavapatna
Hi Doug,
After merging the rdma tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/infiniband/hw/bnxt_re/main.c: In function 'bnxt_re_net_ring_free':
drivers/infiniband/hw/bnxt_re/main.c:231:18: error: 'RING_ALLOC_REQ_RING_TYPE_CMPL' undeclared (first use in this function)
req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
^
drivers/infiniband/hw/bnxt_re/main.c:231:18: note: each undeclared identifier is reported only once for each function it appears in
drivers/infiniband/hw/bnxt_re/main.c: In function 'bnxt_re_net_ring_alloc':
drivers/infiniband/hw/bnxt_re/main.c:271:18: error: 'RING_ALLOC_REQ_RING_TYPE_CMPL' undeclared (first use in this function)
req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
^
Caused by commit
1ac5a4047975 ("RDMA/bnxt_re: Add bnxt_re RoCE driver")
interacting with commit
bac9a7e0f5d6 ("bnxt_en: Update to firmware interface spec 1.7.0.")
from the net-next tree.
I added this merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 15 Feb 2017 11:23:25 +1100
Subject: [PATCH] RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/infiniband/hw/bnxt_re/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
index 6b9f1178050f..bd452a92b386 100644
--- a/drivers/infiniband/hw/bnxt_re/main.c
+++ b/drivers/infiniband/hw/bnxt_re/main.c
@@ -228,7 +228,7 @@ static int bnxt_re_net_ring_free(struct bnxt_re_dev *rdev, u16 fw_ring_id,
}
bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_RING_FREE, -1, -1);
- req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
+ req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
req.ring_id = cpu_to_le16(fw_ring_id);
bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
@@ -268,7 +268,7 @@ static int bnxt_re_net_ring_alloc(struct bnxt_re_dev *rdev, dma_addr_t *dma_arr,
/* Association of ring index with doorbell index and MSIX number */
req.logical_id = cpu_to_le16(map_index);
req.length = cpu_to_le32(ring_mask + 1);
- req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
+ req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
req.int_mode = RING_ALLOC_REQ_INT_MODE_MSIX;
bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
--
2.10.2
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: manual merge of the f2fs tree with the fscrypt tree
From: Stephen Rothwell @ 2017-02-14 22:51 UTC (permalink / raw)
To: Jaegeuk Kim, Theodore Ts'o
Cc: linux-next, linux-kernel, Eric Biggers, Bhumika Goyal
Hi Jaegeuk,
Today's linux-next merge of the f2fs tree got a conflict in:
fs/f2fs/super.c
between commit:
a5d431eff2e0 ("fscrypt: make fscrypt_operations.key_prefix a string")
from the fscrypt tree and commit:
aacf533a90a7 ("f2fs: super: constify fscrypt_operations structure")
from the f2fs 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 fs/f2fs/super.c
index 503c3b7fa053,8a02d747fa97..000000000000
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@@ -1170,9 -1207,9 +1201,9 @@@ static unsigned f2fs_max_namelen(struc
inode->i_sb->s_blocksize : F2FS_NAME_LEN;
}
- static struct fscrypt_operations f2fs_cryptops = {
+ static const struct fscrypt_operations f2fs_cryptops = {
+ .key_prefix = "f2fs:",
.get_context = f2fs_get_context,
- .key_prefix = f2fs_key_prefix,
.set_context = f2fs_set_context,
.is_encrypted = f2fs_encrypted_inode,
.empty_dir = f2fs_empty_dir,
^ permalink raw reply
* Re: redefinition of ‘native_pud_clear’ error on x86
From: Dave Jiang @ 2017-02-14 19:42 UTC (permalink / raw)
To: Kees Cook, Alexander Kapshuk, Matthew Wilcox, Andrew Morton
Cc: Linux-Next, x86@kernel.org
In-Reply-To: <CAGXu5jKpNZNdxPfPKSuE+oAHdXp8Rgv0tD_o-bR=as-N4YaPxQ@mail.gmail.com>
On 02/14/2017 12:31 PM, Kees Cook wrote:
> On Tue, Feb 14, 2017 at 8:14 AM, Alexander Kapshuk
> <alexander.kapshuk@gmail.com> wrote:
>> I'm getting this error on x86 when compiling next-20170214.
>> Any advice on how to fix this would be much appreciated.
>>
>> time make -j2
>> ...
>> CC arch/x86/kernel/asm-offsets.s
>> GEN scripts/gdb/linux/constants.py
>> In file included from ./include/linux/mm.h:68:0,
>> from ./include/linux/suspend.h:8,
>> from arch/x86/kernel/asm-offsets.c:12:
>> ./arch/x86/include/asm/pgtable.h:66:26: error: redefinition of
>> ‘native_pud_clear’
>> #define pud_clear(pud) native_pud_clear(pud)
>> ^
>> ./arch/x86/include/asm/pgtable-3level.h:128:20: note: in expansion of
>> macro ‘pud_clear’
>> static inline void pud_clear(pud_t *pudp)
>> ^
>> In file included from ./arch/x86/include/asm/pgtable_32.h:44:0,
>> from ./arch/x86/include/asm/pgtable.h:581,
>> from ./include/linux/mm.h:68,
>> from ./include/linux/suspend.h:8,
>> from arch/x86/kernel/asm-offsets.c:12:
>> ./arch/x86/include/asm/pgtable-3level.h:124:20: note: previous
>> definition of ‘native_pud_clear’ was here
>> static inline void native_pud_clear(pud_t *pudp)
>> ^
>> make[1]: *** [Kbuild:82: arch/x86/kernel/asm-offsets.s] Error 1
>> make: *** [Makefile:1033: prepare0] Error 2
>>
>> real 0m10.637s
>> user 0m9.466s
>> sys 0m2.752s
>
> Seems like it's related to "mm, x86: add support for PUD-sized
> transparent hugepages".
Can I please get a config file to reproduce? Thanks!
>
> -Kees
>
^ permalink raw reply
* Re: redefinition of ‘native_pud_clear’ error on x86
From: Kees Cook @ 2017-02-14 19:31 UTC (permalink / raw)
To: Alexander Kapshuk, Matthew Wilcox, Dave Jiang, Andrew Morton
Cc: Linux-Next, x86@kernel.org
In-Reply-To: <CAJ1xhMXXcqi9mo4jQG5bT03ocP9aXwn2d0DMKTiA_-bCnwiLcA@mail.gmail.com>
On Tue, Feb 14, 2017 at 8:14 AM, Alexander Kapshuk
<alexander.kapshuk@gmail.com> wrote:
> I'm getting this error on x86 when compiling next-20170214.
> Any advice on how to fix this would be much appreciated.
>
> time make -j2
> ...
> CC arch/x86/kernel/asm-offsets.s
> GEN scripts/gdb/linux/constants.py
> In file included from ./include/linux/mm.h:68:0,
> from ./include/linux/suspend.h:8,
> from arch/x86/kernel/asm-offsets.c:12:
> ./arch/x86/include/asm/pgtable.h:66:26: error: redefinition of
> ‘native_pud_clear’
> #define pud_clear(pud) native_pud_clear(pud)
> ^
> ./arch/x86/include/asm/pgtable-3level.h:128:20: note: in expansion of
> macro ‘pud_clear’
> static inline void pud_clear(pud_t *pudp)
> ^
> In file included from ./arch/x86/include/asm/pgtable_32.h:44:0,
> from ./arch/x86/include/asm/pgtable.h:581,
> from ./include/linux/mm.h:68,
> from ./include/linux/suspend.h:8,
> from arch/x86/kernel/asm-offsets.c:12:
> ./arch/x86/include/asm/pgtable-3level.h:124:20: note: previous
> definition of ‘native_pud_clear’ was here
> static inline void native_pud_clear(pud_t *pudp)
> ^
> make[1]: *** [Kbuild:82: arch/x86/kernel/asm-offsets.s] Error 1
> make: *** [Makefile:1033: prepare0] Error 2
>
> real 0m10.637s
> user 0m9.466s
> sys 0m2.752s
Seems like it's related to "mm, x86: add support for PUD-sized
transparent hugepages".
-Kees
--
Kees Cook
Pixel Security
^ permalink raw reply
* redefinition of ‘native_pud_clear’ error on x86
From: Alexander Kapshuk @ 2017-02-14 16:14 UTC (permalink / raw)
To: linux-next
I'm getting this error on x86 when compiling next-20170214.
Any advice on how to fix this would be much appreciated.
time make -j2
...
CC arch/x86/kernel/asm-offsets.s
GEN scripts/gdb/linux/constants.py
In file included from ./include/linux/mm.h:68:0,
from ./include/linux/suspend.h:8,
from arch/x86/kernel/asm-offsets.c:12:
./arch/x86/include/asm/pgtable.h:66:26: error: redefinition of
‘native_pud_clear’
#define pud_clear(pud) native_pud_clear(pud)
^
./arch/x86/include/asm/pgtable-3level.h:128:20: note: in expansion of
macro ‘pud_clear’
static inline void pud_clear(pud_t *pudp)
^
In file included from ./arch/x86/include/asm/pgtable_32.h:44:0,
from ./arch/x86/include/asm/pgtable.h:581,
from ./include/linux/mm.h:68,
from ./include/linux/suspend.h:8,
from arch/x86/kernel/asm-offsets.c:12:
./arch/x86/include/asm/pgtable-3level.h:124:20: note: previous
definition of ‘native_pud_clear’ was here
static inline void native_pud_clear(pud_t *pudp)
^
make[1]: *** [Kbuild:82: arch/x86/kernel/asm-offsets.s] Error 1
make: *** [Makefile:1033: prepare0] Error 2
real 0m10.637s
user 0m9.466s
sys 0m2.752s
^ permalink raw reply
* next-20170214 build: 0 failures 7 warnings (next-20170214)
From: Build bot for Mark Brown @ 2017-02-14 13:57 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170214
Git describe: next-20170214
Commit: b483962237 Add linux-next specific files for 20170214
Build Time: 212 min 37 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 7
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
7 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Warnings Summary: 7
1 ../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../include/linux/device.h:1477:15: warning: passing argument 1 of 'platform_driver_unregister' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../include/linux/device.h:1472:20: warning: passing argument 1 of '__platform_driver_register' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../drivers/iio/adc/rcar-gyroadc.c:429:27: warning: 'num_channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:428:23: warning: 'channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:426:22: warning: 'sample_width' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:398:26: warning: 'adcmode' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
../drivers/iio/adc/rcar-gyroadc.c:429:27: warning: 'num_channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:426:22: warning: 'sample_width' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:428:23: warning: 'channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:398:26: warning: 'adcmode' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/device.h:1472:20: warning: passing argument 1 of '__platform_driver_register' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../include/linux/device.h:1477:15: warning: passing argument 1 of 'platform_driver_unregister' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm64-allmodconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: linux-next: build failure after merge of the net tree
From: Arnaldo Carvalho de Melo @ 2017-02-14 13:54 UTC (permalink / raw)
To: Jiri Olsa
Cc: Ingo Molnar, Stephen Rothwell, David Miller, Networking,
linux-next, linux-kernel, Alexei Starovoitov, Peter Zijlstra,
Ingo Molnar, Alexander Shishkin, Arnaldo Carvalho de Melo
In-Reply-To: <20170214132326.GD18546@krava>
Em Tue, Feb 14, 2017 at 02:23:26PM +0100, Jiri Olsa escreveu:
> On Tue, Feb 14, 2017 at 09:50:20AM -0300, Arnaldo Carvalho de Melo wrote:
>
> SNIP
>
> >
> > What I think Ingo meant with dependency at the build system level is to
> > somehow state that if file A gets changed, then tool B must be rebuilt.
> >
> > Now that samples/bpf and tools/perf/ depend on tools/lib/bpf/ I _always_
> > build both, ditto for tools/objtool, that shares a different library
> > with tools/perf/, tools/lib/subcmd/:
> >
> > ENTRYPOINT make -C /git/linux/tools/perf O=/tmp/build/perf && \
> > rm -rf /tmp/build/perf/{.[^.]*,*} && \
> > make NO_LIBELF=1 -C /git/linux/tools/perf O=/tmp/build/perf && \
> > make -C /git/linux/tools/objtool O=/tmp/build/objtool && \
> > make -C /git/linux O=/tmp/build/linux allmodconfig && \
> > make -C /git/linux O=/tmp/build/linux headers_install && \
> > make -C /git/linux O=/tmp/build/linux samples/bpf/
> >
> > This is the default action for my
> > docker.io/acmel/linux-perf-tools-build-fedora:rawhide container.
> >
> > It is published, so a:
> >
> > docker pull docker.io/acmel/linux-perf-tools-build-fedora:rawhide
> >
> > And then run it before pushing things upstream would catch these kinds
> > of errors.
> >
> > But that would possibly disrupt too much people's workflow, that is why
> > using the Kbuild originated tools/build/ we have to somehow express that
> > when a change is made in a file then a tool that uses that file needs to
> > be rebuilt.
>
> we already have the check in the check-headers.sh script,
> an AFAICS there's no 'rebuild' option here.. just warn or fail
> because the headers update needs to be done manualy
... when needed. And that will only be detected if you try to build
tools using what is in tools/include/linux/bpf.h
Tools using tools/lib/bpf/ _must_ use what is in tools/include/.
So lemme see if my reasoning is right:
tools/lib/bpf/bpf.c has:
#include <linux/bpf.h>
Now, samples/bpf/ will build tools/lib/bpf/bpf.o:
# Libbpf dependencies
LIBBPF := ../../tools/lib/bpf/bpf.o
HOSTCFLAGS += -I$(objtree)/usr/include
HOSTCFLAGS += -I$(srctree)/tools/lib/
HOSTCFLAGS += -I$(srctree)/tools/testing/selftests/bpf/
HOSTCFLAGS += -I$(srctree)/tools/lib/ -I$(srctree)/tools/include
HOSTCFLAGS += -I$(srctree)/tools/perf
HOSTCFLAGS_bpf_load.o += -I$(objtree)/usr/include -Wno-unused-variable
So it will never include tools/include/uapi/linux/bpf.h, which it
should.
Because the workflow people working on sample/bpf/ is to first install
the new headers using a variation of:
make headers_install
So they will get the new bpf.h, not use tools/include/uapi/linux/bpf.h,
b00m.
They should use tools/include/uapi/linux/bpf.h, which is the one we know
builds well with tools/lib/bpf/bpf.c, since we tested it last time we
made the copy.
> > Makefile rules probably would be enough, but then it would have to be
> > done at the tools/build/ level and all tools using shared components
> > would have to use it to trigger the rebuild.
> we can move/invoke the check-headers.sh script in some upper dir
Most of the time I just ignore that warning, only when I find spare time
I go look if the changes in the kernel copy, i.e. upstream, should
trigger changes in the tools using its copy in tools/include/.
- Arnaldo
^ permalink raw reply
* Re: linux-next: manual merge of the kvm tree with the powerpc tree
From: Paolo Bonzini @ 2017-02-14 13:34 UTC (permalink / raw)
To: Michael Ellerman, Stephen Rothwell, Marcelo Tosatti, Gleb Natapov,
KVM, Benjamin Herrenschmidt, PowerPC
Cc: linux-next, linux-kernel, Nicholas Piggin
In-Reply-To: <87k28tma8d.fsf@concordia.ellerman.id.au>
On 14/02/2017 09:45, Michael Ellerman wrote:
>> If possible, please pull only up to "powerpc/64: Allow for relocation-on
>> interrupts from guest to host" and cherry-pick the top two patches
>> ("powerpc/64: CONFIG_RELOCATABLE support for hmi interrupts" and
>> "powerpc/powernv: Remove separate entry for OPAL real mode calls") into
>> your next branch, but leave the rest for my tree only.
>
> I don't see how that helps anything.
>
> In fact it guarantees a mess because those two commits would now go to
> Linus via my tree (cherry picked) and via Paul's as part of his second
> merge of the topic branch.
>
> So unless you can give me a good reason I'll merge the tip of the topic
> branch into my next, as planned.
Yes, Paul's second merge did guarantee a mess, so go ahead.
However, the reason was that this is simply not how topic branches
should work: topic branches should be the base for other work, they
shouldn't contain _all_ the work. So the right workflow would have been:
- Paul submits topic branch A to you
- you merge A
- Paul merges topic branch A into his "next" branch
- Paul applies KVM-specific patches B1 on top of his "next" branch.
- Paul sends pull request to me (with A + kvmppc work).
As far as I understand, there was no reason for you to get B1.
The last two patches (let's call them B2) also didn't need to go through
the kvm-ppc branch at all. You could have applied them directly on top
of A. Linus then would get A and B2 from you, and A and B1 from me:
base -→ A -----→ B1
↓ ↓
ppc -→ ▪ ▪ ←- kvm
↓ |
B2 |
↓ ↓
torvalds/linux.git
If necessary, things could have been arranged so that Linus got A and B2
from you, and all three of A/B1/B2 from me:
- Paul submits topic branch B2 to you, based on topic branch A
- you merge B2
- Paul merges B2 and I get it from him
The result would have been:
base -→ A -----→ B1
↓ ↘ ↓
ppc -→ ▪ B2 → ▪
↓ ↙ ↓
▪ ▪ ←- kvm
↓ ↓
torvalds/linux.git
Paolo
^ permalink raw reply
* Re: linux-next: build failure after merge of the net tree
From: Jiri Olsa @ 2017-02-14 13:23 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Ingo Molnar, Stephen Rothwell, David Miller, Networking,
linux-next, linux-kernel, Alexei Starovoitov, Peter Zijlstra,
Ingo Molnar, Alexander Shishkin, Arnaldo Carvalho de Melo
In-Reply-To: <20170214125020.GA4458@kernel.org>
On Tue, Feb 14, 2017 at 09:50:20AM -0300, Arnaldo Carvalho de Melo wrote:
SNIP
>
> What I think Ingo meant with dependency at the build system level is to
> somehow state that if file A gets changed, then tool B must be rebuilt.
>
> Now that samples/bpf and tools/perf/ depend on tools/lib/bpf/ I _always_
> build both, ditto for tools/objtool, that shares a different library
> with tools/perf/, tools/lib/subcmd/:
>
> ENTRYPOINT make -C /git/linux/tools/perf O=/tmp/build/perf && \
> rm -rf /tmp/build/perf/{.[^.]*,*} && \
> make NO_LIBELF=1 -C /git/linux/tools/perf O=/tmp/build/perf && \
> make -C /git/linux/tools/objtool O=/tmp/build/objtool && \
> make -C /git/linux O=/tmp/build/linux allmodconfig && \
> make -C /git/linux O=/tmp/build/linux headers_install && \
> make -C /git/linux O=/tmp/build/linux samples/bpf/
>
> This is the default action for my
> docker.io/acmel/linux-perf-tools-build-fedora:rawhide container.
>
> It is published, so a:
>
> docker pull docker.io/acmel/linux-perf-tools-build-fedora:rawhide
>
> And then run it before pushing things upstream would catch these kinds
> of errors.
>
> But that would possibly disrupt too much people's workflow, that is why
> using the Kbuild originated tools/build/ we have to somehow express that
> when a change is made in a file then a tool that uses that file needs to
> be rebuilt.
we already have the check in the check-headers.sh script,
an AFAICS there's no 'rebuild' option here.. just warn or fail
because the headers update needs to be done manualy
>
> Makefile rules probably would be enough, but then it would have to be
> done at the tools/build/ level and all tools using shared components
> would have to use it to trigger the rebuild.
we can move/invoke the check-headers.sh script in some upper dir
jirka
^ permalink raw reply
* Re: linux-next: build failure after merge of the net tree
From: Arnaldo Carvalho de Melo @ 2017-02-14 12:50 UTC (permalink / raw)
To: Jiri Olsa
Cc: Ingo Molnar, Stephen Rothwell, David Miller, Networking,
linux-next, linux-kernel, Alexei Starovoitov, Peter Zijlstra,
Ingo Molnar, Alexander Shishkin, Arnaldo Carvalho de Melo
In-Reply-To: <20170214091937.GA18546@krava>
Em Tue, Feb 14, 2017 at 10:19:37AM +0100, Jiri Olsa escreveu:
> On Tue, Feb 14, 2017 at 07:42:21AM +0100, Ingo Molnar wrote:
> > * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > Unfortunately, the perf header files are kept separate from the kernel
> > > header files proper and are not automatically copied over :-(
> > No, that's wrong, the problem is not that headers were not shared, the problem is
> > that a tooling interdependency was not properly tested *and* that the dependency
> > was not properly implemented in the build system either.
> > Note that we had similar build breakages when include headers _were_ shared as
> > well, so sharing the headers would only have worked around this particular bug and
> > would have introduced fragility in other places...
> > The best, most robust solution in this particular case would be to fix the
> > (tooling) build system to express the dependency, that would have shown the build
> > failure right when the modification was done.
> so we have the warning now:
> Warning: tools/include/uapi/linux/bpf.h differs from kernel
> do you want to change it into the build failure?
No. Differences in the copy are not always problematic, the problem here
lies elsewhere.
Please run:
make -C tools all
To build all tools when you touch something in tools/include and/or
tools/lib/
- Arnaldo
Bored? Here is what I first wrote ;-)
Simply using the kernel original would require kernel hackers to build
all tools using that file, something we long decided not to do.
What I think Ingo meant with dependency at the build system level is to
somehow state that if file A gets changed, then tool B must be rebuilt.
Now that samples/bpf and tools/perf/ depend on tools/lib/bpf/ I _always_
build both, ditto for tools/objtool, that shares a different library
with tools/perf/, tools/lib/subcmd/:
ENTRYPOINT make -C /git/linux/tools/perf O=/tmp/build/perf && \
rm -rf /tmp/build/perf/{.[^.]*,*} && \
make NO_LIBELF=1 -C /git/linux/tools/perf O=/tmp/build/perf && \
make -C /git/linux/tools/objtool O=/tmp/build/objtool && \
make -C /git/linux O=/tmp/build/linux allmodconfig && \
make -C /git/linux O=/tmp/build/linux headers_install && \
make -C /git/linux O=/tmp/build/linux samples/bpf/
This is the default action for my
docker.io/acmel/linux-perf-tools-build-fedora:rawhide container.
It is published, so a:
docker pull docker.io/acmel/linux-perf-tools-build-fedora:rawhide
And then run it before pushing things upstream would catch these kinds
of errors.
But that would possibly disrupt too much people's workflow, that is why
using the Kbuild originated tools/build/ we have to somehow express that
when a change is made in a file then a tool that uses that file needs to
be rebuilt.
Makefile rules probably would be enough, but then it would have to be
done at the tools/build/ level and all tools using shared components
would have to use it to trigger the rebuild.
- Arnaldo
^ permalink raw reply
* Re: linux-next: build failure after merge of the net tree
From: Jiri Olsa @ 2017-02-14 9:19 UTC (permalink / raw)
To: Ingo Molnar
Cc: Stephen Rothwell, David Miller, Networking, linux-next,
linux-kernel, Alexei Starovoitov, Peter Zijlstra, Ingo Molnar,
Arnaldo Carvalho de Melo, Alexander Shishkin,
Arnaldo Carvalho de Melo
In-Reply-To: <20170214064221.GB10242@gmail.com>
On Tue, Feb 14, 2017 at 07:42:21AM +0100, Ingo Molnar wrote:
>
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Hi all,
> >
> > After merging the net tree, today's linux-next build (powerpc64le perf)
> > failed like this:
> >
> > Warning: tools/include/uapi/linux/bpf.h differs from kernel
> > bpf.c: In function 'bpf_prog_attach':
> > bpf.c:180:6: error: 'union bpf_attr' has no member named 'attach_flags'; did you mean 'map_flags'?
> > attr.attach_flags = flags;
> > ^
> >
> > Caused by commit
> >
> > 7f677633379b ("bpf: introduce BPF_F_ALLOW_OVERRIDE flag")
> >
> > Unfortunately, the perf header files are kept separate from the kernel
> > header files proper and are not automatically copied over :-(
>
> No, that's wrong, the problem is not that headers were not shared, the problem is
> that a tooling interdependency was not properly tested *and* that the dependency
> was not properly implemented in the build system either.
>
> Note that we had similar build breakages when include headers _were_ shared as
> well, so sharing the headers would only have worked around this particular bug and
> would have introduced fragility in other places...
>
> The best, most robust solution in this particular case would be to fix the
> (tooling) build system to express the dependency, that would have shown the build
> failure right when the modification was done.
so we have the warning now:
Warning: tools/include/uapi/linux/bpf.h differs from kernel
do you want to change it into the build failure?
jirka
^ permalink raw reply
* Re: [PATCH] tile: fix build failure
From: Thomas Gleixner @ 2017-02-14 8:48 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Sudip Mukherjee, Chris Metcalf, linux-kernel, Peter Zijlstra,
linux-next
In-Reply-To: <20170214100157.1740cdee@canb.auug.org.au>
On Tue, 14 Feb 2017, Stephen Rothwell wrote:
> > linux-next is still failing for this error. Who will pick this up?
>
> Presumably the tip tree (timers/core). Added Thomas to cc.
Applied.
^ permalink raw reply
* Re: linux-next: manual merge of the kvm tree with the powerpc tree
From: Michael Ellerman @ 2017-02-14 8:45 UTC (permalink / raw)
To: Paolo Bonzini, Stephen Rothwell, Marcelo Tosatti, Gleb Natapov,
KVM, Benjamin Herrenschmidt, PowerPC
Cc: linux-next, linux-kernel, Paul Mackerras, Nicholas Piggin
In-Reply-To: <60b17c77-fb90-20e7-8cc7-a5970d2e5691@redhat.com>
Paolo Bonzini <pbonzini@redhat.com> writes:
> On 10/02/2017 04:59, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the kvm tree got a conflict in:
>>
>> arch/powerpc/include/asm/head-64.h
>>
>> between commit:
>>
>> 852e5da99d15 ("powerpc/64s: Tidy up after exception handler rework")
>>
>> from the powerpc tree and commit:
>>
>> 7ede531773ea ("KVM: PPC: Book3S: Move 64-bit KVM interrupt handler out from alt section")
>>
>> from the kvm tree.
>
> Michael, please pull the topic branch as soon as possible, so that the
> conflicts don't hit Linus.
They won't hit Linus until I send my pull request.
> That said, the topic branch is a mess. It starts with generic arch
> patches (until "powerpc/64: Allow for relocation-on interrupts from
> guest to host") then it's only KVM, then on the top there's two more
> generic patches that were added _after_ Paul merged it.
It's not a mess, it's a collection of patches which touch either arch/powerpc
or arch/powerpc/kvm, or are otherwise related.
Yeah I could have merged just the start of Paul's series, but that
seemed pointless, it doesn't prevent or add any conflicts, and it means
I'm unable to test his series as a whole.
Paul has also now merged the remaining two commits, and sent you a pull
request including them.
> If possible, please pull only up to "powerpc/64: Allow for relocation-on
> interrupts from guest to host" and cherry-pick the top two patches
> ("powerpc/64: CONFIG_RELOCATABLE support for hmi interrupts" and
> "powerpc/powernv: Remove separate entry for OPAL real mode calls") into
> your next branch, but leave the rest for my tree only.
I don't see how that helps anything.
In fact it guarantees a mess because those two commits would now go to
Linus via my tree (cherry picked) and via Paul's as part of his second
merge of the topic branch.
So unless you can give me a good reason I'll merge the tip of the topic
branch into my next, as planned.
cheers
^ 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