* next-20160614 build: 1 failures 11 warnings (next-20160614)
From: Build bot for Mark Brown @ 2016-06-14 12:08 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160614
Git describe: next-20160614
Commit: 81e615f6c6 Add linux-next specific files for 20160614
Build Time: 138 min 40 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 11
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
5 warnings 0 mismatches : arm64-allmodconfig
3 warnings 0 mismatches : arm-multi_v7_defconfig
75 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm-multi_v5_defconfig
4 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
3 ../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
Warnings Summary: 11
66 ../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
4 ../drivers/clk/sunxi/clk-sun4i-tcon-ch1.c:82:6: warning: unused variable 'num_parents' [-Wunused-variable]
3 ../drivers/net/phy/mdio-mux.c:188:3: warning: 'parent_bus_node' may be used uninitialized in this function [-Wmaybe-uninitialized]
3 ../arch/arm/include/asm/pgtable.h:262:15: warning: 'entry' may be used uninitialized in this function [-Wmaybe-uninitialized]
2 ../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
2 ../include/linux/compaction.h:242:54: warning: 'struct node' declared inside parameter list
2 ../include/linux/compaction.h:237:51: warning: its scope is only this definition or declaration, which is probably not what you want
2 ../include/linux/compaction.h:237:51: warning: 'struct node' declared inside parameter list
2 ../drivers/staging/ks7010/ks7010_config.c:263:8: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../include/linux/of.h:1002:20: warning: comparison of distinct pointer types lacks a cast
1 ../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
../drivers/clk/sunxi/clk-sun4i-tcon-ch1.c:82:6: warning: unused variable 'num_parents' [-Wunused-variable]
../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/net/phy/mdio-mux.c:188:3: warning: 'parent_bus_node' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/staging/ks7010/ks7010_config.c:263:8: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../arch/arm/include/asm/pgtable.h:262:15: warning: 'entry' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/clk/sunxi/clk-sun4i-tcon-ch1.c:82:6: warning: unused variable 'num_parents' [-Wunused-variable]
../drivers/net/phy/mdio-mux.c:188:3: warning: 'parent_bus_node' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 3 errors, 75 warnings, 0 section mismatches
Errors:
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
Warnings:
../arch/arm/include/asm/pgtable.h:262:15: warning: 'entry' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/compaction.h:237:51: warning: 'struct node' declared inside parameter list
../include/linux/compaction.h:237:51: warning: its scope is only this definition or declaration, which is probably not what you want
../include/linux/compaction.h:242:54: warning: 'struct node' declared inside parameter list
../drivers/clk/sunxi/clk-sun4i-tcon-ch1.c:82:6: warning: unused variable 'num_parents' [-Wunused-variable]
../include/linux/of.h:1002:20: warning: comparison of distinct pointer types lacks a cast
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/staging/ks7010/ks7010_config.c:263:8: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/net/phy/mdio-mux.c:188:3: warning: 'parent_bus_node' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../arch/arm/include/asm/pgtable.h:262:15: warning: 'entry' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
../include/linux/compaction.h:237:51: warning: 'struct node' declared inside parameter list
../include/linux/compaction.h:237:51: warning: its scope is only this definition or declaration, which is probably not what you want
../include/linux/compaction.h:242:54: warning: 'struct node' declared inside parameter list
../drivers/clk/sunxi/clk-sun4i-tcon-ch1.c:82:6: warning: unused variable 'num_parents' [-Wunused-variable]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
arm-allnoconfig
x86_64-defconfig
^ permalink raw reply
* Re: linux-next: manual merge of the kvms390 tree with the s390 tree
From: Christian Borntraeger @ 2016-06-14 8:45 UTC (permalink / raw)
To: Stephen Rothwell, Cornelia Huck, Martin Schwidefsky,
Heiko Carstens
Cc: linux-next, linux-kernel, Janosch Frank, Paolo Bonzini
In-Reply-To: <20160614145117.54eba7ec@canb.auug.org.au>
On 06/14/2016 06:51 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> arch/s390/hypfs/hypfs_diag.c
>
> between commit:
>
> 6c22c9863760 ("s390: avoid extable collisions")
>
> from the s390 tree and commit:
>
> e65f30e0cb29 ("s390: hypfs: Move diag implementation and data definitions")
>
> from the kvms390 tree.
>
> I fixed it up (using the kvms390 version and then adding the following
> patch) 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.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 14 Jun 2016 14:47:33 +1000
> Subject: [PATCH] s390: merge fix up for __diag204 move
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/s390/kernel/diag.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c
> index a44faf4a0454..2289d6f8bec0 100644
> --- a/arch/s390/kernel/diag.c
> +++ b/arch/s390/kernel/diag.c
> @@ -169,7 +169,7 @@ static inline int __diag204(unsigned long subcode, unsigned long size, void *add
>
> asm volatile(
> " diag %2,%0,0x204\n"
> - "0:\n"
> + "0: nopr %%r7\n"
> EX_TABLE(0b,0b)
> : "+d" (_subcode), "+d" (_size) : "d" (addr) : "memory");
> if (_subcode)
>
Yes, thanks. This conflict (and the other preexisting one) will move soon to Paolos KVM tree
as I plan to submit my first pull request soon.
Christian
^ permalink raw reply
* linux-next: Tree for Jun 14
From: Stephen Rothwell @ 2016-06-14 6:55 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160609:
Undropped tree: amlogic
My fixes tree is empty again.
The amlogic tree lost its build failure.
The nfs tree gained a build failure so I sed the version from
next-20160609.
The crypto tree gained a conflict against the amlogic tree.
The drm tree gained a conflict against the drm-intel-fixes tree.
The block tree gained conflicts against Linus' and the btrfs trees.
The md tree gained conflicts against the block tree.
The kvms390 tree gained a conflict against the s390 tree.
The staging tree gained conflict against the staging.current and block
trees.
Non-merge commits (relative to Linus' tree): 3059
3113 files changed, 142838 insertions(+), 50922 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 233 trees (counting Linus' and 34 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 (5edb56491d48 Linux 4.7-rc3)
Merging fixes/master (5edb56491d48 Linux 4.7-rc3)
Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables)
Merging arc-current/for-curr (5edb56491d48 Linux 4.7-rc3)
Merging arm-current/fixes (56530f5d2ddc ARM: 8579/1: mm: Fix definition of pmd_mknotpresent)
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 (3b6d1eb7ea65 powerpc/mm/hash: Compute the segment size correctly for ISA 3.0)
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 (d941ebe88a41 net: ethernet: ti: cpsw: use destroy ctlr to destroy channels)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (50219538ffc0 vmxnet3: segCnt can be 1 for LRO packets)
Merging wireless-drivers/master (182fd9eecb28 MAINTAINERS: Add file patterns for wireless device tree bindings)
Merging mac80211/master (3d5fdff46c4b wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel)
Merging sound-current/for-linus (35639a0e9839 ALSA: hda - Add PCI ID for Kabylake)
Merging pci-current/for-linus (96381c04ef9b PCI: hv: Handle all pending messages in hv_pci_onchannelcallback())
Merging driver-core.current/driver-core-linus (5edb56491d48 Linux 4.7-rc3)
Merging tty.current/tty-linus (5edb56491d48 Linux 4.7-rc3)
Merging usb.current/usb-linus (e4600d56323e Merge tag 'phy-for-4.7-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-linus)
Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command)
Merging usb-serial-fixes/usb-linus (af8c34ce6ae3 Linux 4.7-rc2)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (a9cc4006155a staging: lustre: lnet: Don't access NULL NI on failure path)
Merging char-misc.current/char-misc-linus (69f1804a9ab6 mei: don't use wake_up_interruptible for wr_ctrl)
Merging input-current/for-linus (540c26087bfb Input: xpad - fix rumble on Xbox One controllers with 2015 firmware)
Merging crypto-current/master (19ced623db2f crypto: ux500 - memmove the right size)
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 (1a77e2bd8c89 kselftests: timers: Add set-tz test case)
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 (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (356d27bbfe33 drm/i915: Extract physical display dimensions from VBT)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (5edb56491d48 Linux 4.7-rc3)
Merging arm/for-next (c524c9d378f8 Merge branches 'component', 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (813f80af1dc9 ARM: SoC: Document merges)
Merging amlogic/for-next (7493d8a4a133 Merge branch 'v4.7/deps/external' into aml-reset)
Merging at91/at91-next (5a0d7c6a48ae Merge branch 'at91-4.7-defconfig' into at91-next)
Merging bcm2835/for-next (c40921768f5f Merge branch anholt/bcm2835-dt-64-next into for-next)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (12f06592e8f6 Merge branch 'imx/dt64' into for-next)
Merging keystone/next (4ae152393ae0 Merge branch 'for_4.8/keystone_dts' into next)
Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (f823934678b5 Merge tag 'omap-for-v4.7/fixes-powedomain' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (275804c07f41 firmware: qcom: scm: Peripheral Authentication Service)
Merging renesas/next (27b5fd3a193b Merge branch 'heads/arm64-dt-for-v4.8' into next)
Merging rockchip/for-next (5e46e8d66d01 Merge branch 'v4.7-clk/fixes' 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 (a0c8f253cf3e Merge branch 'for-v4.8/exynos-mfc' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig
Merging tegra/for-next (f59273b16284 Merge branch for-4.8/arm64 into for-next)
Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer)
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 (787ca32dc704 ia64/unaligned: Silence another GCC warning about an uninitialised variable)
Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging m68knommu/for-next (5edb56491d48 Linux 4.7-rc3)
Merging metag/for-next (592ddeeff8cb metag: Fix typos)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (847e858f3d0e SSB: Change bare unsigned to unsigned int to suit coding style)
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 (138a076496e6 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (86d18a55dd66 s390/topology: remove z10 special handling)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (9fbd49cff0f0 tile: allow disabling CONFIG_EARLY_PRINTK)
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 (c717a308f397 Merge branch 'for-next-next-4.7-20160613' into for-next-20160613)
Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache)
Merging cifs/for-next (3bdc426e2497 cifs: dynamic allocation of ntlmssp blob)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (b9d8905e4a75 reiserfs: check kstrdup failure)
Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO)
Merging f2fs/dev (fb88de96bd89 f2fs: report error for f2fs_parent_dir)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (4441f63ab7e5 fuse: update mailing list in MAINTAINERS)
Merging gfs2/for-next (36e4ad0316c0 GFS2: don't set rgrp gl_object until it's inserted into rgrp tree)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (631009987f81 Merge branch 'writeback')
$ git reset --hard HEAD^
Merging next-20160609 version of nfs
Merging nfsd/nfsd-next (9e62f931dd07 rpc: share one xps between all backchannels)
Merging orangefs/for-next (2dcd0af568b0 Linux 4.6)
Merging overlayfs/overlayfs-next (6510690149a9 ovl: store ovl_entry in inode->i_private for all inodes)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1112018cefc5 ubifs: ubifs_dump_inode: Fix dumping field bulk_read)
Merging xfs/for-next (26f1fe858f27 xfs: reduce lock hold times in buffer writeback)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (1eb82bc8e712 Merge branch 'for-linus' into for-next)
Merging pci/next (af8c34ce6ae3 Linux 4.7-rc2)
Merging pstore/for-next/pstore (cae7316708c4 efi-pstore: implement efivars_pstore_exit())
Merging hid/for-next (9037766900ff Merge branch 'for-4.8/i2c-hid' into for-next)
Merging i2c/i2c/for-next (33c77abcf4aa i2c: robotfuzz-osif: Constify osif_table)
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 (6bd8de90309e hwmon: Add support for INA3221 Triple Current/Voltage Monitors)
Merging v4l-dvb/master (be77ec684f3d Merge branch 'patchwork' into to_next)
Merging pm/linux-next (a42dcdb2922f Merge branch 'pm-cpufreq' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (546afd1a3678 Merge branches 'for-rc' and 'thermal-sysfs-locking' into next)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
CONFLICT (add/add): Merge conflict in drivers/thermal/tango_thermal.c
CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (916a890eaff2 Merge branch 'topic/xilinx' into next)
Merging net-next/master (99860208bc62 sched: remove NET_XMIT_POLICED)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (625b44fc15f8 ipvs: count pre-established TCP states as active)
Merging wireless-drivers-next/master (d02fb8f14b2d brcmfmac: rework function picking free BSS index)
Merging bluetooth/master (e69f73bfecb0 Merge branch 'remove-qdisc-throttle')
Merging mac80211-next/master (e69f73bfecb0 Merge branch 'remove-qdisc-throttle')
Merging rdma/for-next (61c78eea9516 IB/IPoIB: Don't update neigh validity for unresolved entries)
Merging rdma-leon/rdma-next (5edb56491d48 Linux 4.7-rc3)
Merging rdma-leon-test/testing/rdma-next (db6066bcf465 Merge branch 'topic/rxe' into testing/rdma-next)
Merging mtd/master (becc7ae544c6 MAINTAINERS: Add file patterns for mtd device tree bindings)
Merging l2-mtd/master (95193796256c mtd: m25p80: read in spi_max_transfer_size chunks)
Merging nand/nand/next (e2442baf99bc mtd: nand: sunxi: fix return value check in sunxi_nfc_dma_op_prepare())
Merging crypto/master (e434cd2dc4de ARM64: dts: meson-gxbb: Add Hardware Random Generator node)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
Merging drm/drm-next (3c85f20a289d Merge tag 'omapdrm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Merging drm-panel/drm/panel/for-next (f103b93d90c2 drm/dsi: Add uevent callback)
Merging drm-intel/for-linux-next (beffa5176fa2 drm/i915/guc: prefer 'dev_priv' to 'dev' for intra-module functions)
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (c02726ffea2d drm/gma500: use drm_crtc_vblank_{on,off}())
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 (2b669875332f drm/msm: Drop load/unload drm_driver ops)
Merging hdlcd/for-upstream/hdlcd (f6c68b4bd4a9 drm: hdlcd: Add information about the underlying framebuffers in debugfs)
Merging sunxi/sunxi/for-next (ac17bf0c25e3 Merge branches 'sunxi/clk-fixes-for-4.7' and 'sunxi/dt-for-4.8' into sunxi/for-next)
Merging kbuild/for-next (3f306a53b571 Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Applying: gcc-plugins: disable under COMPILE_TEST
Merging kspp/for-next/kspp (445701384575 gcc-plugins: disable under COMPILE_TEST)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (65a003e5c0c9 Merge remote-tracking branches 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next)
Merging sound/for-next (43aa56d95d2c ALSA: sh: aica: Remove deprecated create_workqueue)
Merging sound-asoc/for-next (4c195b15cd98 Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sti', 'asoc/topic/tas571x', 'asoc/topic/tlv320aic31xx' and 'asoc/topic/wm8985' into asoc-next)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (1afca2b66aac Input: add Pegasus Notetaker tablet driver)
Merging block/for-next (6f785ee3645f Merge branch 'for-4.8/drivers' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in block/blk-lib.c
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (e83068a5faaf dm mpath: add optional "queue_mode" feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (b28173343703 mmc: tmio: make a cast explicit)
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 (b52207ef4ea5 mfd: hi655x: Add MFD driver for hi655x)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (d04b674e1887 power/reset: make syscon_poweroff() static)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (d86007e58274 Merge remote-tracking branches 'regulator/topic/mt6397', 'regulator/topic/pfuze100', 'regulator/topic/pwm' and 'regulator/topic/twl' into regulator-next)
Merging security/next (40d273782ff1 security: tomoyo: simplify the gc kthread creation)
Merging integrity/next (05d1a717ec04 ima: add support for creating files using the mknodat syscall)
Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record)
Merging selinux/next (50b8629a606b netlabel: handle sparse category maps in netlbl_catmap_getlong())
Merging tpmdd/next (e8f2f45a4402 tpm: Fix suspend regression)
Merging watchdog/master (1a695a905c18 Linux 4.7-rc1)
Merging iommu/next (6c0b43df74f9 Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next)
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (f70552809419 vfio_pci: Test for extended capabilities if config space > 256 bytes)
Merging jc_docs/docs-next (8569de68e79e docs: kernel-doc: Add "example" and "note" to the magic section types)
Merging trivial/for-next (52bbe141f37f gitignore: fix wording)
Merging audit/next (2b4c7afe79a8 audit: fixup: log on errors from filter user rules)
Merging devicetree/for-next (06dfeef88573 drivers: of: add definition of early_init_dt_alloc_reserved_memory_arch)
Merging mailbox/mailbox-for-next (9ef3c5112139 mailbox: mailbox-test: set tdev->signal to NULL after freeing)
Merging spi/for-next (50fdfdf1300c Merge remote-tracking branches 'spi/topic/flash-dma', 'spi/topic/maintainers', 'spi/topic/orion', 'spi/topic/pxa2xx' and 'spi/topic/rockchip' into spi-next)
Merging tip/auto-latest (b2fcfd7a8046 Merge branch 'x86/asm')
Merging clockevents/clockevents/next (52be039599e1 Merge branch 'clockevents/clksrc-of-ret-4' into clockevents/next)
CONFLICT (content): Merge conflict in drivers/clocksource/arm_arch_timer.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (ab564cb51ee6 EDAC, altera: Handle Arria10 SDRAM child node)
Merging irqchip/irqchip/for-next (ebf63bb87f67 Merge branch 'irqchip/misc' into irqchip/for-next)
Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID)
Merging rcu/rcu/next (b8ec0e6dbecf documentation: Clarify limited control-dependency scope)
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Applying: rcu: merge fix for kernel/rcu/tree_exp.h
Merging kvm/linux-next (dca4d728773a kvm/x86: remove unnecessary header file inclusion)
Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts)
Merging kvms390/next (a7e19ab55ffd KVM: s390: handle missing storage-key facility)
CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c
Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c
Applying: s390: merge fix up for __diag204 move
Merging xen-tip/linux-next (bdadcaf2a7c1 xen: remove incorrect forward declaration)
Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction)
Merging workqueues/for-next (f1e89a8f3358 Merge branch 'for-4.6-fixes' into for-next)
Merging drivers-x86/for-next (b740d2e9233c platform/x86: Add PMC Driver for Intel Core SoC)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (3c13ab1d96e1 HSI: cmt_speech: Fix double spin_lock)
Merging leds/for-next (818b02a6f689 MAINTAINERS: Add file patterns for led device tree bindings)
Merging ipmi/for-next (4e80ad011c9c ipmi: Remove smi_msg from waiting_rcv_msgs list before handle_one_recv_msg())
Merging driver-core/driver-core-next (5edb56491d48 Linux 4.7-rc3)
Merging tty/tty-next (5edb56491d48 Linux 4.7-rc3)
Merging usb/usb-next (76d15c8fba65 ehci-platform: Add support for shared reset controllers)
Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP)
Merging usb-serial/usb-next (af8c34ce6ae3 Linux 4.7-rc2)
Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM)
Merging staging/staging-next (21ca52bb749e staging: lustre: lnet: Replace semaphore ln_rc_signal with completion)
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 (content): Merge conflict in drivers/iio/industrialio-trigger.c
$ git rm -f drivers/staging/lustre/lustre/llite/lloop.c
Merging char-misc/char-misc-next (c0ff9019ee64 mei: drop wr_msg from the mei_dev structure)
Merging extcon/extcon-next (4239b7f76be3 Merge branch 'ib-extcon-powersupply-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into extcon-next)
Merging cgroup/for-next (332d8a2fd141 cgroup: set css->id to -1 during init)
Merging scsi/for-next (4d8e355acc29 Merge branch 'misc' into for-next)
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 (5219d6530ef0 ata: Use IS_ENABLED() instead of checking for built-in or module)
Merging pinctrl/for-next (fe9f516997c6 Merge branch 'devel' into for-next)
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 (a13c8bdda15e Merge branch 'rproc-next' into for-next)
Merging gpio/for-next (32d92ac3d936 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (52e0c06dc7b4 pwm: Remove gratuitous blank line)
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)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (72ad679aa718 clk: nxp: Select MFD_SYSCON for creg driver)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1a695a905c18 Linux 4.7-rc1)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (6436d4c1a83c x86/vdso: Fail the build if the vdso image has no dynamic section)
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 (706700160586 coresight: Fix erroneous memset in tmc_read_unprepare_etr)
Merging rtc/rtc-next (c361db5c2c64 x86: include linux/ratelimit.h in nmi.c)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36092ee8ba69 Merge branch 'for-4.7/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (8e2bc198f1d4 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in include/linux/bitmap.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: drivers/fpga/Kconfig: fix build failure
Applying: tree-wide: replace config_enabled() with IS_ENABLED()
Merging akpm/master (8a5177ba836f tree-wide: replace config_enabled() with IS_ENABLED())
^ permalink raw reply
* linux-next: manual merge of the staging tree with the block tree
From: Stephen Rothwell @ 2016-06-14 5:07 UTC (permalink / raw)
To: Greg KH, Jens Axboe
Cc: linux-next, linux-kernel, James Simmons, Mike Christie
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/lustre/lustre/llite/lloop.c
between commit:
95fe6c1a209e ("block, fs, mm, drivers: use bio set/get op accessors")
from the block tree and commit:
67b1a24e883c ("staging: lustre: llite: remove lloop device")
from the staging tree.
I fixed it up (I removed the file) 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: manual merge of the staging tree with the staging.current tree
From: Stephen Rothwell @ 2016-06-14 5:04 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Crestez Dan Leonard, Jonathan Cameron
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/iio/industrialio-trigger.c
between commit:
995438233579 ("iio: Fix error handling in iio_trigger_attach_poll_func")
from the staging.current tree and commit:
ef2d71d6b7fb ("iio: triggers: Make trigger ops structure explicitly non optional.")
from the staging 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/iio/industrialio-trigger.c
index 0c52dfe64977,672911293987..000000000000
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@@ -220,14 -217,15 +223,14 @@@ static int iio_trigger_attach_poll_func
ret = request_threaded_irq(pf->irq, pf->h, pf->thread,
pf->type, pf->name,
pf);
- if (ret < 0) {
- module_put(pf->indio_dev->info->driver_module);
- return ret;
- }
+ if (ret < 0)
+ goto out_put_irq;
+ /* Enable trigger in driver */
- if (trig->ops && trig->ops->set_trigger_state && notinuse) {
+ if (trig->ops->set_trigger_state && notinuse) {
ret = trig->ops->set_trigger_state(trig, true);
if (ret < 0)
- module_put(pf->indio_dev->info->driver_module);
+ goto out_free_irq;
}
return ret;
^ permalink raw reply
* Re: linux-next: manual merge of the kvms390 tree with the s390 tree
From: Heiko Carstens @ 2016-06-14 4:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Christian Borntraeger, Cornelia Huck, Martin Schwidefsky,
linux-next, linux-kernel, Janosch Frank
In-Reply-To: <20160614145117.54eba7ec@canb.auug.org.au>
On Tue, Jun 14, 2016 at 02:51:17PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> arch/s390/hypfs/hypfs_diag.c
>
> between commit:
>
> 6c22c9863760 ("s390: avoid extable collisions")
>
> from the s390 tree and commit:
>
> e65f30e0cb29 ("s390: hypfs: Move diag implementation and data definitions")
>
> from the kvms390 tree.
>
> I fixed it up (using the kvms390 version and then adding the following
> patch) 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.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 14 Jun 2016 14:47:33 +1000
> Subject: [PATCH] s390: merge fix up for __diag204 move
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/s390/kernel/diag.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c
> index a44faf4a0454..2289d6f8bec0 100644
> --- a/arch/s390/kernel/diag.c
> +++ b/arch/s390/kernel/diag.c
> @@ -169,7 +169,7 @@ static inline int __diag204(unsigned long subcode, unsigned long size, void *add
>
> asm volatile(
> " diag %2,%0,0x204\n"
> - "0:\n"
> + "0: nopr %%r7\n"
> EX_TABLE(0b,0b)
> : "+d" (_subcode), "+d" (_size) : "d" (addr) : "memory");
> if (_subcode)
The patch looks good. Thank you!
^ permalink raw reply
* linux-next: manual merge of the kvms390 tree with the s390 tree
From: Stephen Rothwell @ 2016-06-14 4:51 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck, Martin Schwidefsky,
Heiko Carstens
Cc: linux-next, linux-kernel, Janosch Frank
Hi all,
Today's linux-next merge of the kvms390 tree got a conflict in:
arch/s390/hypfs/hypfs_diag.c
between commit:
6c22c9863760 ("s390: avoid extable collisions")
from the s390 tree and commit:
e65f30e0cb29 ("s390: hypfs: Move diag implementation and data definitions")
from the kvms390 tree.
I fixed it up (using the kvms390 version and then adding the following
patch) 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.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 14 Jun 2016 14:47:33 +1000
Subject: [PATCH] s390: merge fix up for __diag204 move
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/s390/kernel/diag.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c
index a44faf4a0454..2289d6f8bec0 100644
--- a/arch/s390/kernel/diag.c
+++ b/arch/s390/kernel/diag.c
@@ -169,7 +169,7 @@ static inline int __diag204(unsigned long subcode, unsigned long size, void *add
asm volatile(
" diag %2,%0,0x204\n"
- "0:\n"
+ "0: nopr %%r7\n"
EX_TABLE(0b,0b)
: "+d" (_subcode), "+d" (_size) : "d" (addr) : "memory");
if (_subcode)
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* Re: linux-next: duplicate patches in the kspp and kbuild trees
From: Stephen Rothwell @ 2016-06-14 4:32 UTC (permalink / raw)
To: Kees Cook; +Cc: Michal Marek, Linux-Next, LKML, Emese Revfy
In-Reply-To: <CAGXu5jJK25pMi1kG2vUfWkZkDBxCVeLUVs61a=m8qmHDTjPg9g@mail.gmail.com>
Hi Kees,
On Mon, 13 Jun 2016 16:57:15 -0700 Kees Cook <keescook@google.com> wrote:
>
> On Mon, Jun 13, 2016 at 4:53 PM, Kees Cook <keescook@google.com> wrote:
> >
> > Strange, I pulled these directly from linux-next. Michal had an
> > auto-responder saying he was going to be out-of-office, so I wanted to
> > make sure the !COMPILE_TEST fix got in.
> >
> > Sounds like I should merge the kbuild tree, rather than cherry-picking
> > from linux-next? I will adjust.
Cherry-picking produces new commits (with new SHA1s etc), while merging
(or rebasing on top of the other versions) will have the same commits
(not just patches).
Having the same commits means that they never produce conflicts after
further changes to the same files (unless both sides of the merge make
further changes to the same files).
> I've done this merge correctly now and pushed a forced update on the kspp tree.
Thanks for that. Now you just have to hope that Michal never rebases
that part of his tree from under you. (Michal: hint! :-))
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the md tree with the block tree
From: Stephen Rothwell @ 2016-06-14 3:52 UTC (permalink / raw)
To: Shaohua Li, Jens Axboe; +Cc: linux-next, linux-kernel, Mike Christie, NeilBrown
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid1.c
between commit:
796a5cf083c2 ("md: use bio op accessors")
from the block tree and commit:
707a6a420ccf ("md/raid1: add rcu protection to rdev in fix_read_error")
from the md 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/md/raid1.c
index 41d9c31da3b3,5027ef4752ac..000000000000
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@@ -2086,15 -2069,20 +2067,21 @@@ static void fix_read_error(struct r1con
(!test_bit(Faulty, &rdev->flags) &&
rdev->recovery_offset >= sect + s)) &&
is_badblock(rdev, sect, s,
- &first_bad, &bad_sectors) == 0 &&
- sync_page_io(rdev, sect, s<<9,
- conf->tmppage, REQ_OP_READ, 0, false))
- success = 1;
- else {
- d++;
- if (d == conf->raid_disks * 2)
- d = 0;
- }
+ &first_bad, &bad_sectors) == 0) {
+ atomic_inc(&rdev->nr_pending);
+ rcu_read_unlock();
+ if (sync_page_io(rdev, sect, s<<9,
- conf->tmppage, READ, false))
++ conf->tmppage, REQ_OP_READ, 0,
++ false))
+ success = 1;
+ rdev_dec_pending(rdev, mddev);
+ if (success)
+ break;
+ } else
+ rcu_read_unlock();
+ d++;
+ if (d == conf->raid_disks * 2)
+ d = 0;
} while (!success && d != read_disk);
if (!success) {
^ permalink raw reply
* linux-next: manual merge of the md tree with the block tree
From: Stephen Rothwell @ 2016-06-14 3:52 UTC (permalink / raw)
To: Shaohua Li, Jens Axboe; +Cc: linux-next, linux-kernel, Mike Christie, NeilBrown
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid10.c
between commit:
796a5cf083c2 ("md: use bio op accessors")
from the block tree and commits:
f90145f317ef ("md/raid10: add rcu protection to rdev access in raid10_sync_request."
d094d6860b66 ("md/raid10: add rcu protection to rdev access during reshape.")
from the md 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/md/raid10.c
index 26ae74fd0d01,8ee5d96e6a2d..000000000000
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@@ -3063,10 -3092,10 +3091,10 @@@ static sector_t raid10_sync_request(str
biolist = bio;
bio->bi_private = r10_bio;
bio->bi_end_io = end_sync_write;
- bio->bi_rw = WRITE;
+ bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
bio->bi_iter.bi_sector = to_addr
- + rdev->data_offset;
- bio->bi_bdev = rdev->bdev;
+ + mrdev->data_offset;
+ bio->bi_bdev = mrdev->bdev;
atomic_inc(&r10_bio->remaining);
} else
r10_bio->devs[1].bio->bi_end_io = NULL;
@@@ -3092,10 -3120,10 +3119,10 @@@
biolist = bio;
bio->bi_private = r10_bio;
bio->bi_end_io = end_sync_write;
- bio->bi_rw = WRITE;
+ bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
bio->bi_iter.bi_sector = to_addr +
- rdev->data_offset;
- bio->bi_bdev = rdev->bdev;
+ mreplace->data_offset;
+ bio->bi_bdev = mreplace->bdev;
atomic_inc(&r10_bio->remaining);
break;
}
@@@ -3212,16 -3251,18 +3250,18 @@@
biolist = bio;
bio->bi_private = r10_bio;
bio->bi_end_io = end_sync_read;
- bio->bi_rw = READ;
+ bio_set_op_attrs(bio, REQ_OP_READ, 0);
- bio->bi_iter.bi_sector = sector +
- conf->mirrors[d].rdev->data_offset;
- bio->bi_bdev = conf->mirrors[d].rdev->bdev;
+ bio->bi_iter.bi_sector = sector + rdev->data_offset;
+ bio->bi_bdev = rdev->bdev;
count++;
- if (conf->mirrors[d].replacement == NULL ||
- test_bit(Faulty,
- &conf->mirrors[d].replacement->flags))
+ rdev = rcu_dereference(conf->mirrors[d].replacement);
+ if (rdev == NULL || test_bit(Faulty, &rdev->flags)) {
+ rcu_read_unlock();
continue;
+ }
+ atomic_inc(&rdev->nr_pending);
+ rcu_read_unlock();
/* Need to set up for writing to the replacement */
bio = r10_bio->devs[i].repl_bio;
@@@ -3234,10 -3274,9 +3273,9 @@@
biolist = bio;
bio->bi_private = r10_bio;
bio->bi_end_io = end_sync_write;
- bio->bi_rw = WRITE;
+ bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
- bio->bi_iter.bi_sector = sector +
- conf->mirrors[d].replacement->data_offset;
- bio->bi_bdev = conf->mirrors[d].replacement->bdev;
+ bio->bi_iter.bi_sector = sector + rdev->data_offset;
+ bio->bi_bdev = rdev->bdev;
count++;
}
@@@ -4521,7 -4569,9 +4568,9 @@@ static int handle_reshape_read_error(st
addr,
s << 9,
bvec[idx].bv_page,
- READ, false);
+ REQ_OP_READ, 0, false);
+ rdev_dec_pending(rdev, mddev);
+ rcu_read_lock();
if (success)
break;
failed:
^ permalink raw reply
* linux-next: manual merge of the block tree with Linus' tree
From: Stephen Rothwell @ 2016-06-14 2:44 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel, Shaun Tancheff, Mike Christie
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
block/blk-lib.c
between commit:
05bd92dddc59 ("block: missing bio_put following submit_bio_wait")
from the FIXME tree and commit:
4e49ea4a3d27 ("block/fs/drivers: remove rw argument from submit_bio")
from the block 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 block/blk-lib.c
index 9e29dc351695,78626c2fde33..000000000000
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@@ -103,17 -111,13 +111,14 @@@ int blkdev_issue_discard(struct block_d
struct blk_plug plug;
int ret;
- if (flags & BLKDEV_DISCARD_SECURE)
- type |= REQ_SECURE;
-
blk_start_plug(&plug);
- ret = __blkdev_issue_discard(bdev, sector, nr_sects, gfp_mask, type,
+ ret = __blkdev_issue_discard(bdev, sector, nr_sects, gfp_mask, flags,
&bio);
if (!ret && bio) {
- ret = submit_bio_wait(type, bio);
+ ret = submit_bio_wait(bio);
if (ret == -EOPNOTSUPP)
ret = 0;
+ bio_put(bio);
}
blk_finish_plug(&plug);
@@@ -166,10 -171,8 +172,10 @@@ int blkdev_issue_write_same(struct bloc
}
}
- if (bio)
+ if (bio) {
- ret = submit_bio_wait(REQ_WRITE | REQ_WRITE_SAME, bio);
+ ret = submit_bio_wait(bio);
+ bio_put(bio);
+ }
return ret != -EOPNOTSUPP ? ret : 0;
}
EXPORT_SYMBOL(blkdev_issue_write_same);
@@@ -209,11 -212,8 +215,11 @@@ static int __blkdev_issue_zeroout(struc
}
}
- if (bio)
- return submit_bio_wait(bio);
+ if (bio) {
- ret = submit_bio_wait(WRITE, bio);
++ ret = submit_bio_wait(bio);
+ bio_put(bio);
+ return ret;
+ }
return 0;
}
^ permalink raw reply
* linux-next: manual merge of the block tree with the btrfs tree
From: Stephen Rothwell @ 2016-06-14 2:44 UTC (permalink / raw)
To: Jens Axboe, David Sterba; +Cc: linux-next, linux-kernel, Mike Christie, Liu Bo
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/extent_io.c
between commit:
f338d193e1c5 ("Btrfs: fix eb memory leak due to readpage failure")
from the btrfs tree and commit:
1f7ad75b13b5 ("btrfs: have submit_one_bio users use bio op accessors")
from the block 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/btrfs/extent_io.c
index b8ecc6af4531,4f8bace0fd1b..000000000000
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@@ -5253,18 -5225,9 +5251,18 @@@ int read_extent_buffer_pages(struct ext
err = __extent_read_full_page(tree, page,
get_extent, &bio,
mirror_num, &bio_flags,
- READ | REQ_META);
+ REQ_META);
- if (err)
+ if (err) {
ret = err;
+ /*
+ * We use &bio in above __extent_read_full_page,
+ * so we ensure that if it returns error, the
+ * current page fails to add itself to bio.
+ *
+ * We must dec io_pages by ourselves.
+ */
+ atomic_dec(&eb->io_pages);
+ }
} else {
unlock_page(page);
}
^ permalink raw reply
* linux-next: build warning after merge of the sunxi tree
From: Stephen Rothwell @ 2016-06-14 2:18 UTC (permalink / raw)
To: Maxime Ripard; +Cc: linux-next, linux-kernel
Hi Maxime,
After merging the sunxi tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:
drivers/clk/sunxi/clk-sun4i-tcon-ch1.c:82:6: warning: unused variable 'num_parents' [-Wunused-variable]
int num_parents = clk_hw_get_num_parents(hw);
^
Introduced by commit
4de2d58bc973 ("clk: sunxi: tcon-ch1: Do not return a negative error in get_parent")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
From: Stephen Rothwell @ 2016-06-14 2:10 UTC (permalink / raw)
To: Dave Airlie, Daniel Vetter, intel-gfx, dri-devel; +Cc: linux-next, linux-kernel
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_display.c
between commit:
a5aac5ab876a ("drm/i915: Check VBT for port presence in addition to the strap on VLV/CHV")
from the drm-intel-fixes tree and commit:
457c52d87e5d ("drm/i915: Only ignore eDP ports that are connected")
(which is also in the drm-intel-fixes tree)
from the drm tree.
I fixed it up (I used the version form the drm-intel-fixes tree) 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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply
* Re: [PATCH] gcc-plugins: disable under COMPILE_TEST
From: Michael Ellerman @ 2016-06-14 2:01 UTC (permalink / raw)
To: Kees Cook, Austin S. Hemmelgarn
Cc: Emese Revfy, Paul Gortmaker, Michal Marek, Stephen Rothwell,
Sudip Mukherjee, Linux-Next, LKML,
kernel-hardening@lists.openwall.com
In-Reply-To: <CAGXu5jLYYg8QdWy0nMLLV4e4=xz7G2U7CBQjsAd5Q5PfZd48ng@mail.gmail.com>
On Mon, 2016-06-13 at 13:11 -0700, Kees Cook wrote:
> On Mon, Jun 13, 2016 at 11:32 AM, Austin S. Hemmelgarn
> <ahferroin7@gmail.com> wrote:
> > On 2016-06-12 20:18, Emese Revfy wrote:
> > >
> > > On Sun, 12 Jun 2016 15:25:39 -0700
> > > Kees Cook <keescook@chromium.org> wrote:
> > >
> > > > I don't like this because it means if someone specifically selects
> > > > some plugins in their .config, and the headers are missing, the kernel
> > > > will successfully compile. For many plugins, this results in a kernel
> > > > that lacks the requested security features, and that I really do not
> > > > want to have happening. I'm okay leaving these disabled for compile
> > > > tests for now. We can revisit this once more distros have plugins
> > > > enabled by default.
> > >
> > > You are right. Your patch is safer.
> > >
> > Why not make it so that if COMPILE_TEST is enabled, the build warns if it
> > can't find the headers, otherwise it fails? That way, people who are doing
> > all*config builds but don't have the headers will still get some build
> > coverage, and the people who are enabling it as a security feature will
> > still get build failures.
>
> I don't see a clear way to do this, but if you can find a way to make
> that happen, please send a patch! :)
Another option is to make the top-level option negative, that way when it's
enabled by allmod/yes the plugins are turned off.
So eg. you would have:
config DISABLE_GCC_PLUGINS
bool "Disable building GCC plugins"
default y
...
This makes all the problems with allmod/yes go away, and means you always honor
the users intent - when DISABLE_GCC_PLUGINS=n you can fail the build if you
can't build the plugins.
The downside is the logic's a bit awkward, ie. to enable the plugins you have to
disable the option which disables them.
cheers
^ permalink raw reply
* linux-next: manual merge of the crypto tree with the amlogic tree
From: Stephen Rothwell @ 2016-06-14 1:50 UTC (permalink / raw)
To: Herbert Xu, Kevin Hilman, Carlo Caione
Cc: linux-next, linux-kernel, Carlo Caione
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in:
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
between commit:
fab6b48ccab3 ("ARM64: dts: amlogic: Add hiu and periphs buses")
from the amlogic tree and commit:
e434cd2dc4de ("ARM64: dts: meson-gxbb: Add Hardware Random Generator node")
from the crypto 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/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 063e3b679207,83536219d9f6..000000000000
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@@ -214,104 -167,11 +214,109 @@@
};
};
+ periphs: periphs@c8834000 {
+ compatible = "simple-bus";
+ reg = <0x0 0xc8834000 0x0 0x2000>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges = <0x0 0x0 0x0 0xc8834000 0x0 0x2000>;
+
+ pinctrl_periphs: pinctrl@4b0 {
+ compatible = "amlogic,meson-gxbb-periphs-pinctrl";
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ gpio: bank@4b0 {
+ reg = <0x0 0x004b0 0x0 0x28>,
+ <0x0 0x004e8 0x0 0x14>,
+ <0x0 0x00120 0x0 0x14>,
+ <0x0 0x00430 0x0 0x40>;
+ reg-names = "mux", "pull", "pull-enable", "gpio";
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ emmc_pins: emmc {
+ mux {
+ groups = "emmc_nand_d07",
+ "emmc_cmd",
+ "emmc_clk";
+ function = "emmc";
+ };
+ };
+
+ sdcard_pins: sdcard {
+ mux {
+ groups = "sdcard_d0",
+ "sdcard_d1",
+ "sdcard_d2",
+ "sdcard_d3",
+ "sdcard_cmd",
+ "sdcard_clk";
+ function = "sdcard";
+ };
+ };
+
+ uart_a_pins: uart_a {
+ mux {
+ groups = "uart_tx_a",
+ "uart_rx_a";
+ function = "uart_a";
+ };
+ };
+
+ uart_b_pins: uart_b {
+ mux {
+ groups = "uart_tx_b",
+ "uart_rx_b";
+ function = "uart_b";
+ };
+ };
+
+ uart_c_pins: uart_c {
+ mux {
+ groups = "uart_tx_c",
+ "uart_rx_c";
+ function = "uart_c";
+ };
+ };
+
+ eth_pins: eth_c {
+ mux {
+ groups = "eth_mdio",
+ "eth_mdc",
+ "eth_clk_rx_clk",
+ "eth_rx_dv",
+ "eth_rxd0",
+ "eth_rxd1",
+ "eth_rxd2",
+ "eth_rxd3",
+ "eth_rgmii_tx_clk",
+ "eth_tx_en",
+ "eth_txd0",
+ "eth_txd1",
+ "eth_txd2",
+ "eth_txd3";
+ function = "eth";
+ };
+ };
+ };
+ };
+
+ hiubus: hiubus@c883c000 {
+ compatible = "simple-bus";
+ reg = <0x0 0xc883c000 0x0 0x2000>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>;
+ };
+
+ rng {
+ compatible = "amlogic,meson-rng";
+ reg = <0x0 0xc8834000 0x0 0x4>;
+ };
+
apb: apb@d0000000 {
compatible = "simple-bus";
reg = <0x0 0xd0000000 0x0 0x200000>;
^ permalink raw reply
* linux-next: build failure after merge of the nfs tree
From: Stephen Rothwell @ 2016-06-14 0:48 UTC (permalink / raw)
To: Trond Myklebust; +Cc: linux-next, linux-kernel
Hi Trond,
After merging the nfs tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
fs/nfs/direct.c: In function 'nfs_direct_write_reschedule':
fs/nfs/direct.c:652:32: error: 'struct pnfs_ds_commit_info' has no member named 'nbuckets'
for (i = 0; i < dreq->ds_cinfo.nbuckets; i++)
^
fs/nfs/direct.c:653:17: error: 'struct pnfs_ds_commit_info' has no member named 'buckets'
dreq->ds_cinfo.buckets[i].direct_verf.committed = NFS_INVALID_STABLE_HOW;
^
Caused by commit
2f9273fd2f09 ("NFS: Ensure we reset the write verifier 'committed' value on resend.")
CONFIG_NFS_V4_1 is not set for this build.
I have used the nfs tree from next-20160609 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: duplicate patches in the kspp and kbuild trees
From: Kees Cook @ 2016-06-13 23:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Michal Marek, Linux-Next, LKML, Emese Revfy
In-Reply-To: <CAGXu5jLh7gXMcdU=F0qWc1S61YX-QmfQHpUfb+sxkQLUXu1Hqw@mail.gmail.com>
On Mon, Jun 13, 2016 at 4:53 PM, Kees Cook <keescook@google.com> wrote:
> On Mon, Jun 13, 2016 at 4:40 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi Kees,
>>
>> As of today, there are four duplicate patches (different commits)
>> in the kspp and kbuild trees.
>>
>> Shared library support
>> GCC plugin infrastructure
>> Add Cyclomatic complexity GCC plugin
>> Add sancov plugin
>>
>> are in both trees as different commits :-( They have been in the kbuild
>> tree for a couple of days already. One of you should be merging the
>> other's branch, or you both should be mergeing a common branch.
>>
>> Also, Kees, the versions in your tree do not have your Signed-off-by
>> (but do have Michal's).
>
> Strange, I pulled these directly from linux-next. Michal had an
> auto-responder saying he was going to be out-of-office, so I wanted to
> make sure the !COMPILE_TEST fix got in.
>
> Sounds like I should merge the kbuild tree, rather than cherry-picking
> from linux-next? I will adjust.
I've done this merge correctly now and pushed a forced update on the kspp tree.
-Kees
>
> Sorry for the confusion!
>
> -Kees
>
> --
> Kees Cook
> Chrome OS & Brillo Security
--
Kees Cook
Chrome OS & Brillo Security
^ permalink raw reply
* Re: linux-next: duplicate patches in the kspp and kbuild trees
From: Kees Cook @ 2016-06-13 23:53 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Michal Marek, Linux-Next, LKML, Emese Revfy
In-Reply-To: <20160614094019.14fac372@canb.auug.org.au>
On Mon, Jun 13, 2016 at 4:40 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Kees,
>
> As of today, there are four duplicate patches (different commits)
> in the kspp and kbuild trees.
>
> Shared library support
> GCC plugin infrastructure
> Add Cyclomatic complexity GCC plugin
> Add sancov plugin
>
> are in both trees as different commits :-( They have been in the kbuild
> tree for a couple of days already. One of you should be merging the
> other's branch, or you both should be mergeing a common branch.
>
> Also, Kees, the versions in your tree do not have your Signed-off-by
> (but do have Michal's).
Strange, I pulled these directly from linux-next. Michal had an
auto-responder saying he was going to be out-of-office, so I wanted to
make sure the !COMPILE_TEST fix got in.
Sounds like I should merge the kbuild tree, rather than cherry-picking
from linux-next? I will adjust.
Sorry for the confusion!
-Kees
--
Kees Cook
Chrome OS & Brillo Security
^ permalink raw reply
* linux-next: duplicate patches in the kspp and kbuild trees
From: Stephen Rothwell @ 2016-06-13 23:40 UTC (permalink / raw)
To: Kees Cook, Michal Marek; +Cc: linux-next, linux-kernel, Emese Revfy
Hi Kees,
As of today, there are four duplicate patches (different commits)
in the kspp and kbuild trees.
Shared library support
GCC plugin infrastructure
Add Cyclomatic complexity GCC plugin
Add sancov plugin
are in both trees as different commits :-( They have been in the kbuild
tree for a couple of days already. One of you should be merging the
other's branch, or you both should be mergeing a common branch.
Also, Kees, the versions in your tree do not have your Signed-off-by
(but do have Michal's).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: [PATCH] gcc-plugins: disable under COMPILE_TEST
From: Kees Cook @ 2016-06-13 20:15 UTC (permalink / raw)
To: Sedat Dilek
Cc: Michal Marek, Stephen Rothwell, Emese Revfy, Paul Gortmaker,
Sudip Mukherjee, Linux-Next, LKML,
kernel-hardening@lists.openwall.com
In-Reply-To: <CA+icZUW-OZMh2foyiQK=0NfakwbiFHTkouMjptgokKTFLZQFQQ@mail.gmail.com>
On Mon, Jun 13, 2016 at 1:40 AM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
> On Sat, Jun 11, 2016 at 6:12 PM, Kees Cook <keescook@chromium.org> wrote:
>> Since adding the gcc plugin development headers is required for the
>> gcc plugin support, we should ease into this new kernel build dependency
>> more slowly. For now, disable the gcc plugins under COMPILE_TEST so that
>> all*config builds will skip it.
>>
>
> [ This might be a bit off-topic - Feel free to answer ]
>
> Hi,
>
> I want to try that new "GCC-plugin" feature.
> Do you have a Git repo for "easy-testing"?
Start with linux-next. It has the basic infrastructure. The
"latent_entropy" plugin is in my kssp tree here:
http://git.kernel.org/cgit/linux/kernel/git/kees/linux.git/log/?h=kspp/gcc-plugins/latent_entropy
though it is not the most up to date version.
> Does the kernel's build-system check for installed "gcc-plugin
> development headers"?
Yes, when the plugins have been selected.
> Which GCC versions support "gcc-plugin" feature?
gcc-4.5 and newer.
> I am here on Ubuntu/precise AMD64 and have gcc-4.6.4 and gcc-4.9.2.
I strongly recommend upgrading to Ubuntu 16.04, but regardless, using
gcc 4.9 should be fine.
> [ Optional ]
> What about the topic and support for "LLVM/Clang and hardening" of the
> Linux-kernel?
I haven't been involved in that project, sorry.
-Kees
--
Kees Cook
Chrome OS & Brillo Security
^ permalink raw reply
* Re: [PATCH] gcc-plugins: disable under COMPILE_TEST
From: Kees Cook @ 2016-06-13 20:11 UTC (permalink / raw)
To: Austin S. Hemmelgarn
Cc: Emese Revfy, Paul Gortmaker, Michal Marek, Stephen Rothwell,
Sudip Mukherjee, Linux-Next, LKML,
kernel-hardening@lists.openwall.com
In-Reply-To: <7102975e-88a5-3555-21e1-f07d595bc235@gmail.com>
On Mon, Jun 13, 2016 at 11:32 AM, Austin S. Hemmelgarn
<ahferroin7@gmail.com> wrote:
> On 2016-06-12 20:18, Emese Revfy wrote:
>>
>> On Sun, 12 Jun 2016 15:25:39 -0700
>> Kees Cook <keescook@chromium.org> wrote:
>>
>>> I don't like this because it means if someone specifically selects
>>> some plugins in their .config, and the headers are missing, the kernel
>>> will successfully compile. For many plugins, this results in a kernel
>>> that lacks the requested security features, and that I really do not
>>> want to have happening. I'm okay leaving these disabled for compile
>>> tests for now. We can revisit this once more distros have plugins
>>> enabled by default.
>>
>>
>> You are right. Your patch is safer.
>>
> Why not make it so that if COMPILE_TEST is enabled, the build warns if it
> can't find the headers, otherwise it fails? That way, people who are doing
> all*config builds but don't have the headers will still get some build
> coverage, and the people who are enabling it as a security feature will
> still get build failures.
I don't see a clear way to do this, but if you can find a way to make
that happen, please send a patch! :)
-Kees
--
Kees Cook
Chrome OS & Brillo Security
^ permalink raw reply
* Re: [PATCH] gcc-plugins: disable under COMPILE_TEST
From: Austin S. Hemmelgarn @ 2016-06-13 18:32 UTC (permalink / raw)
To: Emese Revfy, Kees Cook
Cc: Paul Gortmaker, Michal Marek, Stephen Rothwell, Sudip Mukherjee,
Linux-Next, LKML, kernel-hardening@lists.openwall.com
In-Reply-To: <20160613021831.9a79c5c82d1511e572023ed6@gmail.com>
On 2016-06-12 20:18, Emese Revfy wrote:
> On Sun, 12 Jun 2016 15:25:39 -0700
> Kees Cook <keescook@chromium.org> wrote:
>
>> I don't like this because it means if someone specifically selects
>> some plugins in their .config, and the headers are missing, the kernel
>> will successfully compile. For many plugins, this results in a kernel
>> that lacks the requested security features, and that I really do not
>> want to have happening. I'm okay leaving these disabled for compile
>> tests for now. We can revisit this once more distros have plugins
>> enabled by default.
>
> You are right. Your patch is safer.
>
Why not make it so that if COMPILE_TEST is enabled, the build warns if
it can't find the headers, otherwise it fails? That way, people who are
doing all*config builds but don't have the headers will still get some
build coverage, and the people who are enabling it as a security feature
will still get build failures.
^ permalink raw reply
* Re: [mmots-2016-06-09-16-49] sleeping function called from slab_alloc()
From: Michal Hocko @ 2016-06-13 10:47 UTC (permalink / raw)
To: Andrew Morton
Cc: Sergey Senozhatsky, Christoph Lameter, Vlastimil Babka,
Stephen Rothwell, linux-mm, linux-next, linux-kernel,
Sergey Senozhatsky, linux-kernel-owner
In-Reply-To: <20160610145916.d071635d6462e4d837959e45@linux-foundation.org>
On Fri 10-06-16 14:59:16, Andrew Morton wrote:
> On Fri, 10 Jun 2016 11:55:54 +0200 mhocko <mhocko@suse.de> wrote:
>
> > On 2016-06-10 11:50, Sergey Senozhatsky wrote:
> > > Hello,
> > >
> > > forked from http://marc.info/?l=linux-mm&m=146553910928716&w=2
> > >
> > > new_slab()->BUG->die()->exit_signals() can be called from atomic
> > > context: local IRQs disabled in slab_alloc().
> >
> > I have sent a patch to drop the BUG() from that path today. It
> > is just too aggressive way to react to a non-critical bug.
> > See
> > http://lkml.kernel.org/r/1465548200-11384-2-git-send-email-mhocko@kernel.org
>
> Doesn't this simply mean that Sergey's workload will blurt a pr_warn()
> rather than a BUG()? That still needs fixing. Confused.
Yes that should be fixed by
http://lkml.kernel.org/r/20160610074223.GC32285@dhcp22.suse.cz
which prevents from using a wrong GFP...
--
Michal Hocko
SUSE Labs
^ permalink raw reply
* Re: [PATCH] gcc-plugins: disable under COMPILE_TEST
From: Sedat Dilek @ 2016-06-13 8:40 UTC (permalink / raw)
To: Kees Cook
Cc: Michal Marek, Stephen Rothwell, Emese Revfy, Paul Gortmaker,
Sudip Mukherjee, Linux-Next, LKML, kernel-hardening
In-Reply-To: <20160611161212.GA29370@www.outflux.net>
On Sat, Jun 11, 2016 at 6:12 PM, Kees Cook <keescook@chromium.org> wrote:
> Since adding the gcc plugin development headers is required for the
> gcc plugin support, we should ease into this new kernel build dependency
> more slowly. For now, disable the gcc plugins under COMPILE_TEST so that
> all*config builds will skip it.
>
[ This might be a bit off-topic - Feel free to answer ]
Hi,
I want to try that new "GCC-plugin" feature.
Do you have a Git repo for "easy-testing"?
Does the kernel's build-system check for installed "gcc-plugin
development headers"?
Which GCC versions support "gcc-plugin" feature?
I am here on Ubuntu/precise AMD64 and have gcc-4.6.4 and gcc-4.9.2.
[ Optional ]
What about the topic and support for "LLVM/Clang and hardening" of the
Linux-kernel?
Regards,
- Sedat -
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> arch/Kconfig | 1 +
> lib/Kconfig.debug | 4 ++--
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/Kconfig b/arch/Kconfig
> index 83aa2a3c470d..3f06d678b1d7 100644
> --- a/arch/Kconfig
> +++ b/arch/Kconfig
> @@ -366,6 +366,7 @@ config HAVE_GCC_PLUGINS
> menuconfig GCC_PLUGINS
> bool "GCC plugins"
> depends on HAVE_GCC_PLUGINS
> + depends on !COMPILE_TEST
> help
> GCC plugins are loadable modules that provide extra features to the
> compiler. They are useful for runtime instrumentation and static analysis.
> diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
> index d40833b9b7f4..0f9981999a27 100644
> --- a/lib/Kconfig.debug
> +++ b/lib/Kconfig.debug
> @@ -713,8 +713,8 @@ config KCOV
> bool "Code coverage for fuzzing"
> depends on ARCH_HAS_KCOV
> select DEBUG_FS
> - select GCC_PLUGINS
> - select GCC_PLUGIN_SANCOV
> + select GCC_PLUGINS if !COMPILE_TEST
> + select GCC_PLUGIN_SANCOV if !COMPILE_TEST
> help
> KCOV exposes kernel code coverage information in a form suitable
> for coverage-guided fuzzing (randomized testing).
> --
> 2.7.4
>
>
> --
> Kees Cook
> Chrome OS & Brillo Security
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ 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