* linux-next: manual merge of the drm-exynos tree with the drm tree
From: Stephen Rothwell @ 2016-09-27 1:41 UTC (permalink / raw)
To: Inki Dae, Dave Airlie
Cc: linux-next, linux-kernel, Liu Ying, Daniel Vetter, Andrzej Hajda
Hi Inki,
Today's linux-next merge of the drm-exynos tree got a conflict in:
drivers/gpu/drm/exynos/exynos_drm_drv.c
between commit:
2b58e98d42af ("drm/atomic-helper: Add NO_DISABLE_AFTER_MODESET flag support for plane commit")
from the drm tree and commit:
3a87f9383457 ("drm/exynos: fix pending update handling")
from the drm-exynos 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/gpu/drm/exynos/exynos_drm_drv.c
index 486943e70f70,a1bc13f4f30a..000000000000
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@@ -89,25 -63,9 +63,9 @@@ static void exynos_atomic_commit_comple
* have the relevant clocks enabled to perform the update.
*/
- for_each_crtc_in_state(state, crtc, crtc_state, i) {
- struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
-
- atomic_set(&exynos_crtc->pending_update, 0);
- }
-
- for_each_plane_in_state(state, plane, plane_state, i) {
- struct exynos_drm_crtc *exynos_crtc =
- to_exynos_crtc(plane->crtc);
-
- if (!plane->crtc)
- continue;
-
- atomic_inc(&exynos_crtc->pending_update);
- }
-
- drm_atomic_helper_commit_planes(dev, state, false);
+ drm_atomic_helper_commit_planes(dev, state, 0);
- exynos_atomic_wait_for_commit(state);
+ drm_atomic_helper_wait_for_vblanks(dev, state);
drm_atomic_helper_cleanup_planes(dev, state);
^ permalink raw reply
* linux-next: manual merge of the kvm-arm tree with the tip tree
From: Stephen Rothwell @ 2016-09-27 3:46 UTC (permalink / raw)
To: Christoffer Dall, Marc Zyngier, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Daniel Thompson
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
arch/arm/include/asm/arch_gicv3.h
between commit:
91ef84428a86 ("irqchip/gic-v3: Reset BPR during initialization")
from the tip tree and commit:
3d9cd95f90b2 ("ARM: gic-v3: Work around definition of gic_write_bpr1")
from the kvm-arm tree.
I fixed it up (I just used the kvm-arm tree version) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging. You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the percpu tree with the asm-generic tree
From: Stephen Rothwell @ 2016-09-27 3:54 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar,
Arnd Bergmann
Cc: linux-next, linux-kernel, Chunyan Zhang, Nicholas Piggin
Hi all,
Today's linux-next merge of the percpu tree got a conflict in:
include/asm-generic/percpu.h
between commit:
acbdf0e98066 ("percpu: make this_cpu_generic_read notrace")
from the asm-generic tree and commit:
1b5ca1212742 ("percpu: improve generic percpu modify-return implementation")
from the percpu 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 include/asm-generic/percpu.h
index 70fefec69e61,40e887068da2..000000000000
--- a/include/asm-generic/percpu.h
+++ b/include/asm-generic/percpu.h
@@@ -108,9 -118,9 +118,9 @@@ do {
#define this_cpu_generic_read(pcp) \
({ \
typeof(pcp) __ret; \
- preempt_disable(); \
+ preempt_disable_notrace(); \
- __ret = *this_cpu_ptr(&(pcp)); \
+ __ret = raw_cpu_generic_read(pcp); \
- preempt_enable(); \
+ preempt_enable_notrace(); \
__ret; \
})
^ permalink raw reply
* linux-next: manual merge of the gpio tree with the i2c tree
From: Stephen Rothwell @ 2016-09-27 5:02 UTC (permalink / raw)
To: Linus Walleij, Wolfram Sang; +Cc: linux-next, linux-kernel, Phil Reid
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in:
drivers/gpio/gpio-pca953x.c
between commit:
6212e1d6ed40 ("gpio: pca953x: variable 'id' was used twice")
from the i2c tree and commit:
e23efa311110 ("gpio: pca954x: Add vcc regulator and enable it")
from the gpio 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/gpio/gpio-pca953x.c
index 018f39cc19c8,5d059866d17a..000000000000
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@@ -765,29 -759,41 +759,43 @@@ static int pca953x_probe(struct i2c_cli
chip->client = client;
+ reg = devm_regulator_get(&client->dev, "vcc");
+ if (IS_ERR(reg)) {
+ ret = PTR_ERR(reg);
+ if (ret != -EPROBE_DEFER)
+ dev_err(&client->dev, "reg get err: %d\n", ret);
+ return ret;
+ }
+ ret = regulator_enable(reg);
+ if (ret) {
+ dev_err(&client->dev, "reg en err: %d\n", ret);
+ return ret;
+ }
+ chip->regulator = reg;
+
- if (id) {
- chip->driver_data = id->driver_data;
+ if (i2c_id) {
+ chip->driver_data = i2c_id->driver_data;
} else {
- const struct acpi_device_id *id;
+ const struct acpi_device_id *acpi_id;
const struct of_device_id *match;
match = of_match_device(pca953x_dt_ids, &client->dev);
if (match) {
chip->driver_data = (int)(uintptr_t)match->data;
} else {
- id = acpi_match_device(pca953x_acpi_ids, &client->dev);
- if (!id) {
+ acpi_id = acpi_match_device(pca953x_acpi_ids, &client->dev);
- if (!acpi_id)
- return -ENODEV;
++ if (!acpi_id) {
+ ret = -ENODEV;
+ goto err_exit;
+ }
- chip->driver_data = id->driver_data;
+ chip->driver_data = acpi_id->driver_data;
}
}
- chip->chip_type = PCA_CHIP_TYPE(chip->driver_data);
-
mutex_init(&chip->i2c_lock);
+ lockdep_set_subclass(&chip->i2c_lock,
+ i2c_adapter_depth(client->adapter));
/* initialize cached registers from their original values.
* we can't share this chip with another i2c master.
^ permalink raw reply
* Re: linux-next: build failure after merge of the rdma tree
From: Christoph Hellwig @ 2016-09-27 5:04 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Doug Ledford, linux-next, linux-kernel, Christoph Hellwig
In-Reply-To: <20160927112334.3615159e@canb.auug.org.au>
On Tue, Sep 27, 2016 at 11:23:34AM +1000, Stephen Rothwell wrote:
> Hi Doug,
>
> After merging the rdma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
Please just disable broken staging code like lustre for the linux-next
builds. We had that discussion before, didn't we?
^ permalink raw reply
* linux-next: manual merge of the gpio tree with the arm-soc tree
From: Stephen Rothwell @ 2016-09-27 5:05 UTC (permalink / raw)
To: Linus Walleij, Olof Johansson, Arnd Bergmann, ARM
Cc: linux-next, linux-kernel, Tony Lindgren
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in:
arch/arm/mach-omap2/board-rx51-peripherals.c
between commit:
9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900")
from the arm-soc tree and commit:
9132ce450bd1 ("ARM: omap2: fix missing include")
from the gpio tree.
I fixed it up (the former removed the file, so I did that) 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
* Re: linux-next: build failure after merge of the rdma tree
From: Stephen Rothwell @ 2016-09-27 5:48 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: Doug Ledford, linux-next, linux-kernel
In-Reply-To: <20160927050415.GA2024@lst.de>
Hi Christoph,
On Tue, 27 Sep 2016 07:04:15 +0200 Christoph Hellwig <hch@lst.de> wrote:
>
> On Tue, Sep 27, 2016 at 11:23:34AM +1000, Stephen Rothwell wrote:
> > Hi Doug,
> >
> > After merging the rdma tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
>
> Please just disable broken staging code like lustre for the linux-next
> builds. We had that discussion before, didn't we?
Yeah, sorry. Note, however, that you bothered to fix up this same
staging file in another of your patches ...
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the akpm-current tree with the arm64 tree
From: Stephen Rothwell @ 2016-09-27 6:03 UTC (permalink / raw)
To: Andrew Morton, Catalin Marinas
Cc: linux-next, linux-kernel, Scott Wood, Will Deacon, Vineet Gupta
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm/Kconfig
between commit:
1d8f51d41fc7 ("arm/arm64: arch_timer: Use archdata to indicate vdso suitability")
from the arm64 tree and commit:
7b4d24d8c01d ("atomic64: no need for CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE")
from the akpm-current 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/arm/Kconfig
index 125657b602a4,2a50957c7bfb..000000000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1,8 -1,6 +1,7 @@@
config ARM
bool
default y
+ select ARCH_CLOCKSOURCE_DATA
- select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
select ARCH_HAS_DEVMEM_IS_ALLOWED
select ARCH_HAS_ELF_RANDOMIZE
select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
^ permalink raw reply
* linux-next: Tree for Sep 27
From: Stephen Rothwell @ 2016-09-27 6:40 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160923:
New tree: vfs-jk
The vfs-jk tree gained a conflict against the fuse tree.
The rdma tree gained a build failure so I used the version from
next-20160923.
The drm-exynos tree gained a conflict against the drm tree.
The kvm-arm tree lost its build failure but gained a conflict against
the tip tree.
The percpu tree gained a conflict against the asm-generic tree.
The gpio tree gained conflicts against the arm-soc and i2c trees.
The akpm-current tree gained a conflict against the arm64 tree.
Non-merge commits (relative to Linus' tree): 12416
9245 files changed, 514935 insertions(+), 255035 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 243 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 (08895a8b6b06 Linux 4.8-rc8)
Merging fixes/master (d3396e1e4ec4 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured)
Merging arc-current/for-curr (3eab887a5542 Linux 4.8-rc4)
Merging arm-current/fixes (1a57c286d8ce ARM: pxa/lubbock: add pcmcia clock)
Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
Merging metag-fixes/fixes (97b1d23f7bcb metag: Drop show_mem() from mem_init())
Merging powerpc-fixes/fixes (b79331a5eb9f powerpc/powernv/pci: Fix m64 checks for SR-IOV and window alignment)
Merging sparc/master (4620a06e4b3c shmem: Fix link error if huge pages support is disabled)
Merging net/master (2cf750704bb6 ipmr, ip6mr: fix scheduling while atomic and a deadlock with ipmr_get_route)
Merging ipsec/master (b1f2beb87bb0 Merge tag 'media/v4.8-7' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging netfilter/master (440f895aa97f drivers: net: phy: xgene: Fix 'remove' function)
Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes')
Merging wireless-drivers/master (db64c5fa590b Merge tag 'iwlwifi-for-kalle-2016-09-15' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (7ac327318e09 Merge tag 'mac80211-for-davem-2016-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
Merging sound-current/for-linus (392c9da24a99 ALSA: hda - Adding one more ALC255 pin definition for headset problem)
Merging pci-current/for-linus (035ee288ae7a PCI: Fix bridge_d3 update on device removal)
Merging driver-core.current/driver-core-linus (c6935931c189 Linux 4.8-rc5)
Merging tty.current/tty-linus (c6935931c189 Linux 4.8-rc5)
Merging usb.current/usb-linus (3be7988674ab Linux 4.8-rc7)
Merging usb-gadget-fixes/fixes (d8a4100ddc75 usb: gadget: udc: atmel: fix endpoint name)
Merging usb-serial-fixes/usb-linus (f190fd92458d USB: serial: simple: add support for another Infineon flashloader)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f3c4fb6d05e usb: chipidea: udc: fix NULL ptr dereference in isr_setup_status_phase)
Merging staging.current/staging-linus (9395452b4aab Linux 4.8-rc6)
Merging char-misc.current/char-misc-linus (c6935931c189 Linux 4.8-rc5)
Merging input-current/for-linus (4af2ff91ec3f Input: silead_gsl1680 - use "silead/" prefix for firmware loading)
Merging crypto-current/master (0cf43f509f72 crypto: rsa-pkcs1pad - Handle leading zero for decryption)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup handling)
Merging kselftest-fixes/fixes (29b4817d4018 Linux 4.8-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API)
Merging drm-intel-fixes/for-linux-next-fixes (08895a8b6b06 Linux 4.8-rc8)
Merging kbuild/for-next (f29ca38b6dd4 ppc: there is no clear_pages to export)
CONFLICT (content): Merge conflict in arch/Kconfig
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
Merging arc/for-next (bdb783677531 ARC: CONFIG_NODES_SHIFT fix default values)
Merging arm/for-next (cebdc42a4a9d Merge branch 'sa1111' into for-next)
Merging arm-perf/for-next/perf (694d0d0bb203 Linux 4.8-rc2)
Merging arm-soc/for-next (d54dae3d6ebd Merge branch 'next/dt' into for-next)
Merging pinctrl/for-next (8d0a0ac0abcd Merge branch 'fixes' into devel)
Merging amlogic/for-next (8148ca0d95ec Merge branch 'v4.8/dt64-2' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (9336be5db24d Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (70da51e698c7 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
Merging mvebu/for-next (a9c51ff3121f Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (624018387bcf Merge branch 'omap-for-v4.9/dt-v2' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (4feeec0c6e6d Merge tag 'qcom-arm64-defconfig-for-4.9' into all-for-4.8)
Merging renesas/next (a64ca8158b21 Merge branches 'fixes-for-v4.8', 'arm64-defconfig-for-v4.9', 'arm64-dt-for-v4.9', 'defconfig-for-v4.9', 'dt-for-v4.9' and 'soc-for-v4.9' into next)
Merging rockchip/for-next (e80be333a38f Merge branch 'v4.9-armsoc/dts32' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1)
Merging samsung-krzk/for-next (ea24fc2674ef Merge branch 'next/dt' into for-next)
Merging tegra/for-next (74e8115883f5 Merge branch for-4.9/arm64/dt into for-next)
Merging arm64/for-next/core (0c2a6cce1776 arm64: Kconfig: select OF/ACPI_NUMA under NUMA config)
CONFLICT (content): Merge conflict in drivers/perf/arm_pmu.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/head.S
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 (2dc024e94578 cris: return of class_create should be considered)
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 (f5e14739ed35 CREDITS: Update fingerprint for Geert Uytterhoeven)
Merging m68knommu/for-next (742859adc721 m68k: let clk_disable() return immediately if clk is NULL)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (c3c9001172e8 Merge branch '4.8-fixes' into mips-for-linux-next)
Merging nios2/for-next (65f836ae4de0 nios2: use of_property_read_bool)
Merging parisc-hd/for-next (92420bd0d01f parisc: Fix self-detected CPU stall warnings on Mako machines)
Merging powerpc/next (f1a55ce05442 powerpc: Clean up tm_abort duplication in hash_utils_64.c)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/misc_64.S
CONFLICT (content): Merge conflict in arch/powerpc/kernel/misc_32.S
Merging fsl/next (e0b80f00bb96 arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (f50af850f407 s390/dasd: make query host access interruptible)
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 (bf55d575234b tile: migrate exception table users off module.h and onto extable.h)
Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9e8511ff7e3f Merge tag 'xtensa-for-next-20160731' of git://github.com/jcmvbkbc/linux-xtensa into for_next)
Merging befs/for-next (58d08821eaa7 befs: befs: fix style issues in datastream.c)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (819d18cf0d4a Merge branch 'for-next-next-4.9-20160927' into for-next-20160927)
Merging ceph/master (0276dca6c1ec rbd: add force close option)
Merging cifs/for-next (659f6f19d311 SMB3: Add mount parameter to allow user to override max credits)
Merging configfs/for-next (42857cf512cb configfs: Return -EFBIG from configfs_write_bin_file.)
Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it)
Merging ext3/for_next (5d3ddd84eaef udf: don't bother with full-page write optimisations in adinicb case)
Merging ext4/dev (e36767750532 blockgroup_lock.h: simplify definition of NR_BG_LOCKS)
Merging f2fs/dev (33aace659965 f2fs: handle errors during recover_orphan_inodes)
CONFLICT (content): Merge conflict in fs/f2fs/dir.c
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (8d75c710a416 fuse: don't use fuse_ioctl_copy_user() helper)
Merging gfs2/for-next (332f51d7db13 gfs2: Initialize atime of I_NEW inodes)
Merging jfs/jfs-next (240c5185c52d jfs: Simplify code)
Merging nfs/linux-next (4d2899d73c47 Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6)
Merging nfsd/nfsd-next (1d8760d8ee19 nfs: fix false positives in nfs40_walk_client_list())
Merging orangefs/for-next (a21aae3bb15a Merge tag 'for-hubcap-v4.9-readahead' of git://github.com/martinbrandenburg/linux)
Merging overlayfs/overlayfs-next (6a45b3628ce4 ovl: Fix info leak in ovl_lookup_temp())
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (17ce1eb0b64e ubifs: Fix xattr generic handler usage)
Merging xfs/for-next (2e405cda91ca Merge branch 'xfs-4.9-log-recovery-fixes' into for-next)
Merging file-locks/linux-next (d67fd44f697d locks: Filter /proc/locks output on proc pid ns)
Merging vfs/for-next (3baf32898e1c parisc: use %pD)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
CONFLICT (content): Merge conflict in fs/fuse/dir.c
Merging vfs-miklos/next (d55af8a321be vfs: add note about i_op->rename changes to porting)
Merging pci/next (c4315f4b5ddc Merge branch 'pci/msi' into next)
Merging pstore/for-next/pstore (f88baf68ebe5 ramoops: move spin_lock_init after kmalloc error checking)
Merging hid/for-next (2736168d1dd1 Merge branch 'for-4.9/logitech' into for-next)
Merging i2c/i2c/for-next (7cbca2b38734 Merge branch 'i2c/for-4.9' 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 (0deb6b2c087a dmi-id: don't free dev structure after calling device_register)
Merging hwmon-staging/hwmon-next (7ce4190c4ca4 hwmon: (nct6775) Add support for multiple virtual temperature sources)
Merging jc_docs/docs-next (17e9217d41e1 Merge branch 'doc/4.9' into docs-next)
Merging v4l-dvb/master (02a628e5c024 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (7e5d1fd5639f Merge branch 'pnp' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (1876b0a39af2 Merge branches 'release' and 'for-rc' into next)
Merging thermal-soc/next (c6935931c189 Linux 4.8-rc5)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging net-next/master (b6f5be287344 net: tg3: use new api ethtool_{get|set}_link_ksettings)
Merging ipsec-next/master (c2f672fc9464 xfrm: state lookup can be lockless)
Merging netfilter-next/master (f20fbc0717f9 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
Applying: netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"
Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL)
Merging wireless-drivers-next/master (2df86ad959c9 brcmfmac: drop unused fields from struct brcmf_pub)
Merging bluetooth/master (be92e538c272 Merge branch 'bnx2x-fix-page-allocation-failure')
Merging mac80211-next/master (8564e38206de cfg80211: add checks for beacon rate, extend to mesh)
Merging rdma/for-next (5603910b1074 Merge branches 'workqueue', '4.9-ioctl' and '4.9-rkey-v2' into k.o/for-4.9)
$ git reset --hard HEAD^
Merging next-20160923 version of rdma
Merging rdma-leon/rdma-next (c6935931c189 Linux 4.8-rc5)
Merging rdma-leon-test/testing/rdma-next (c6935931c189 Linux 4.8-rc5)
Merging mtd/master (f6d7c1b5598b mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl)
Merging l2-mtd/master (f6d7c1b5598b mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl)
Merging nand/nand/next (d44154f969a4 mtd: nand: Provide nand_cleanup() function to free NAND related resources)
Merging crypto/master (5ecf8ef9103c crypto: caam - fix sg dump)
Merging drm/drm-next (52f13a02b7d5 Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-plane.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/imx-drm-core.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_audio.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_execbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h
CONFLICT (content): Merge conflict in Documentation/gpu/index.rst
Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel)
Merging drm-intel/for-linux-next (3ec92362cda4 drm/i915/skl: drop workarounds for F0 revision)
Merging drm-tegra/drm/tegra/for-next (08ee01789eeb drm/tegra: Fix window[0] base address corruption)
Merging drm-misc/topic/drm-misc (089cfdd9b0ec drm: bridge: analogix/dp: mark symbols static where possible)
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
Merging drm-exynos/exynos-drm/for-next (3a87f9383457 drm/exynos: fix pending update handling)
CONFLICT (content): Merge conflict in drivers/gpu/drm/exynos/exynos_drm_drv.c
Merging drm-msm/msm-next (7a3bcc0a8e2a drm/msm: bump kernel api version for explicit fencing)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_gem_submit.c
Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (d035f1204017 Merge branches 'sunxi/core-for-4.9', 'sunxi/drm-for-4.9', 'sunxi/dt-for-4.9' and 'sunxi/config64-for-4.9', tags 'sunxi-clk-fixes-for-4.8' and 'sunxi-fixes-for-4.8' into sunxi/for-next)
Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (ca4c3b36769f Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next)
Merging sound/for-next (8da08ca03b73 ALSA: usb-line6: use the same declaration as definition in header for MIDI manufacturer ID)
Merging sound-asoc/for-next (e561be67a4b5 Merge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/tpa6130a2', 'asoc/topic/ux500' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit)
Merging input/next (51db013767c4 Input: serio - add hangup support)
Merging block/for-next (69a83f9cc81e Merge branch 'for-4.9/block' into for-next)
Merging lightnvm/for-next (b67347d7dc28 lightnvm: propagate device_add() error code)
CONFLICT (content): Merge conflict in drivers/nvme/host/core.c
Merging device-mapper/for-next (7cd326747f46 dm bufio: remove dm_bufio_cond_resched())
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (0f75c404503c mmc: dw_mmc: remove the deprecated "supports-highspeed" property)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (099b548c4292 raid6/test/test.c: bug fix: Specify aligned(alignment) attributes to the char arrays)
CONFLICT (content): Merge conflict in include/linux/raid/pq.h
Merging mfd/for-mfd-next (7e3a80214faa mfd: cros_ec_spi: Remove unused variable 'request')
Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator)
Merging battery/for-next (bb1e41ba324f power: reset: st: Remove obsolete platforms from dt doc)
Merging omap_dss2/for-next (ee65e18206f5 fb: adv7393: off by one in probe function)
Merging regulator/for-next (b2de85634be3 Merge remote-tracking branch 'regulator/topic/tps80031' into regulator-next)
Merging security/next (8a17ef9d8543 Merge branch 'stable-4.9' of git://git.infradead.org/users/pcmoore/selinux into next)
Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (9b6a9ecc2d88 selinux: fix error return code in policydb_read())
Merging tpmdd/next (ebfd7532e985 tpm: add check for minimum buffer size in tpm_transmit())
Merging watchdog/master (7dd2ce7c91bd watchdog: st_wdt: Remove support for obsolete platforms)
Merging iommu/next (13a08259187c Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/renesas' and 'arm/smmu' into next)
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (c93a97ee0583 vfio-pci: Disable INTx after MSI/X teardown)
Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
Merging audit/next (fa2bea2f5cca audit: consistently record PIDs with task_tgid_nr())
Merging devicetree/for-next (f94277af03ea of/platform: Initialise dev->fwnode appropriately)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging mailbox/mailbox-for-next (a649244de727 dt-bindings: mailbox: Add Amlogic Meson MHU Bindings)
Merging spi/for-next (eef5cb3e2a40 Merge remote-tracking branches 'spi/topic/ti-qspi', 'spi/topic/tools', 'spi/topic/txx9' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (56c1bc3e0562 Merge branch 'x86/apic' into auto-latest)
CONFLICT (content): Merge conflict in include/linux/jump_label.h
CONFLICT (content): Merge conflict in arch/x86/lib/memcpy_64.S
CONFLICT (modify/delete): arch/x86/kernel/x8664_ksyms_64.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/x86/kernel/x8664_ksyms_64.c left in tree.
$ git rm -f arch/x86/kernel/x8664_ksyms_64.c
Applying: cpufreq: merge fix for type of cpufreq_offline changing
Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (a29d64a45eed EDAC, altera: Add IRQ Flags to disable IRQ while handling)
Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
Merging ftrace/for-next (f971cc9aabc2 tracing: Have max_latency be defined for HWLAT_TRACER as well)
CONFLICT (content): Merge conflict in kernel/trace/trace_functions_graph.c
CONFLICT (content): Merge conflict in include/linux/ftrace.h
Merging rcu/rcu/next (52e6bc6d43a4 bug: Avoid Kconfig warning for BUG_ON_DATA_CORRUPTION)
Merging kvm/linux-next (adad0d02a7d3 kvm: svm: fix unsigned compare less than zero comparison)
Merging kvm-arm/next (3d9cd95f90b2 ARM: gic-v3: Work around definition of gic_write_bpr1)
CONFLICT (content): Merge conflict in arch/arm/include/asm/arch_gicv3.h
Merging kvm-mips/next (397fc7ecb8e1 KVM: MIPS: Drop dubious EntryHi optimisation)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (aad9e5ba2433 KVM: PPC: e500: Rename jump labels in kvmppc_e500_tlb_init())
Merging kvms390/next (b0eb91ae630a Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next)
Merging xen-tip/linux-next (4f0fbdf22e73 xen/grant-table: Use kmalloc_array() in arch_gnttab_valloc())
Merging percpu/for-next (799bc3c51b2b percpu: eliminate two sparse warnings)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging workqueues/for-next (863b710b664b workqueue: remove keventd_up())
Merging drivers-x86/for-next (28e476d7438e platform/x86: toshiba_bluetooth: Decouple an error checking status code)
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 (6f3bad967072 leds: triggers: Check return value of kobject_uevent_env())
CONFLICT (content): Merge conflict in MAINTAINERS
Merging ipmi/for-next (37090ee7e76e ipmi/bt-bmc: add a dependency on ARCH_ASPEED)
Merging driver-core/driver-core-next (6ee6d1cb391c carl9170: fix debugfs crashes)
Merging tty/tty-next (e98d41370392 devpts: Change the owner of /dev/pts/ptmx to the mounter of /dev/pts)
Merging usb/usb-next (984f3be5910c usb: musb: da8xx: fix error handling message in probe)
Merging usb-gadget/next (e6be244a8321 usb: gadget: uvc: add V4L2 dependency)
Merging usb-serial/usb-next (61fc51366b39 USB: serial: ti_usb_3410_5052: remove unused variables)
Merging usb-chipidea-next/ci-for-usb-next (e74e83724808 usb: chipidea: udc: Use the preferred form for passing a size of a struct)
Merging staging/staging-next (0ae952e3bd1c staging: wlan-ng: fix block comments style errors)
CONFLICT (content): Merge conflict in drivers/staging/octeon/ethernet-mdio.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/file.c
CONFLICT (content): Merge conflict in MAINTAINERS
Merging char-misc/char-misc-next (6eb1c9496b81 clk: probe common clock drivers earlier)
Merging extcon/extcon-next (38085c987f52 extcon: Add support for qcom SPMI PMIC USB id detection hardware)
Merging slave-dma/next (a77656f17255 Merge branch 'topic/ste_dma40' into next)
Merging cgroup/for-next (353b02cb7084 Merge branch 'for-4.8-fixes' into for-next)
Merging scsi/for-next (ce50b74722ef Merge branch 'misc' into for-next)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (6568bba8c0e3 Merge branch 'for-4.9' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (789ffaecf80b virtio_pci: Limit DMA mask to 44 bits for legacy virtio devices)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (c2da060a2d88 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (e3296f19c862 gpio: Added zynq specific check for special pins on bank zero)
CONFLICT (content): Merge conflict in drivers/gpio/gpio-pca953x.c
CONFLICT (content): Merge conflict in drivers/gpio/gpio-mxc.c
CONFLICT (content): Merge conflict in arch/arm64/Kconfig.platforms
CONFLICT (modify/delete): arch/arm/mach-omap2/board-rx51-peripherals.c deleted in HEAD and modified in gpio/for-next. Version gpio/for-next of arch/arm/mach-omap2/board-rx51-peripherals.c left in tree.
$ git rm -f arch/arm/mach-omap2/board-rx51-peripherals.c
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (dc8e6e1e8f2d Merge branch 'for-4.9/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 (2ed6afdee798 netns: move {inc,dec}_net_namespaces into #ifdef)
CONFLICT (content): Merge conflict in include/linux/sysctl.h
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (b4626a7f4892 CLK: Add Loongson1C clock support)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (a67cd5482f37 tools: move pcmcia crc32hash tool from Documentation)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
CONFLICT (content): Merge conflict in fs/afs/main.c
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific)
Merging coresight/next (6015bb25e7b3 coresight: stm: return error code instead of zero in .packet())
Merging rtc/rtc-next (00f7f90c51df rtc: cmos: avoid unused function warning)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (371a2fbecadd Merge branch 'for-4.9/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (60bf815c0d08 Revert "softirq: fix tasklet_kill() and its users")
CONFLICT (content): Merge conflict in include/linux/relay.h
CONFLICT (content): Merge conflict in arch/powerpc/kernel/Makefile
CONFLICT (content): Merge conflict in arch/parisc/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Applying: powerpc: merge fix for CONFIG_WORD_SIZE -> BITS rename
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: include/linux/mlx5/device.h: kill BUILD_BUG_ON()s
Applying: kdump, vmcoreinfo: report memory sections virtual addresses
Applying: mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
Applying: scripts/tags.sh: enable code completion in VIM
Applying: kthread: add kerneldoc for kthread_create()
Applying: hung_task: allow hung_task_panic when hung_task_warnings is 0
Applying: hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix
Applying: treewide: remove redundant #include <linux/kconfig.h>
Merging akpm/master (172361526fed treewide: remove redundant #include <linux/kconfig.h>)
^ permalink raw reply
* Re: linux-next: manual merge of the vfs-jk tree with the fuse tree
From: Jan Kara @ 2016-09-27 7:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jan Kara, Miklos Szeredi, linux-next, linux-kernel
In-Reply-To: <20160927101204.19fdab82@canb.auug.org.au>
Hi Stephen,
On Tue 27-09-16 10:12:04, Stephen Rothwell wrote:
> Today's linux-next merge of the vfs-jk tree got a conflict in:
>
> fs/fuse/dir.c
>
> between commits:
>
> 3b3fb74935ce ("fuse: invalidate dir dentry after chmod")
> 5f69e628df75 ("fuse: fix killing s[ug]id in setattr")
>
> from the fuse tree and commit:
>
> 62490330769c ("fuse: Propagate dentry down to inode_change_ok()")
>
> from the vfs-jk tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
Thanks! The resolution looks good to me.
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply
* next-20160927 build: 2 failures 4 warnings (next-20160927)
From: Build bot for Mark Brown @ 2016-09-27 9:49 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160927
Git describe: next-20160927
Commit: 31e69fdf27 Add linux-next specific files for 20160927
Build Time: 85 min 35 sec
Passed: 8 / 10 ( 80.00 %)
Failed: 2 / 10 ( 20.00 %)
Errors: 2
Warnings: 4
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
arm-allmodconfig
ERROR: "__aeabi_uldivmod" [net/netfilter/xt_hashlimit.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : arm64-allmodconfig
6 warnings 0 mismatches : arm-multi_v5_defconfig
6 warnings 0 mismatches : arm-multi_v7_defconfig
3 warnings 0 mismatches : arm-allmodconfig
3 warnings 0 mismatches : arm-multi_v4t_defconfig
3 warnings 0 mismatches : arm-allnoconfig
-------------------------------------------------------------------------------
Errors summary: 2
2 ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
1 ERROR: "__aeabi_uldivmod" [net/netfilter/xt_hashlimit.ko] undefined!
Warnings Summary: 4
7 <stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
7 <stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
7 <stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
1 ../include/linux/kernel.h:739:16: warning: comparison of distinct pointer types lacks a cast
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 1 errors, 1 warnings, 0 section mismatches
Errors:
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
Warnings:
../include/linux/kernel.h:739:16: warning: comparison of distinct pointer types lacks a cast
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 2 errors, 3 warnings, 0 section mismatches
Errors:
ERROR: "__aeabi_uldivmod" [net/netfilter/xt_hashlimit.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v4t_defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
x86_64-defconfig
arm64-defconfig
^ permalink raw reply
* Re: linux-next: Tree for Sep 27
From: Sergey Senozhatsky @ 2016-09-27 10:03 UTC (permalink / raw)
To: Aaron Conole
Cc: linux-next, linux-kernel, Stephen Rothwell, Florian Westphal,
Pablo Neira Ayuso, netdev, netfilter-devel, Sergey Senozhatsky,
Sergey Senozhatsky
In-Reply-To: <20160927164026.741b290b@canb.auug.org.au>
Hello,
On (09/27/16 16:40), Stephen Rothwell wrote:
>
> Changes since 20160923:
>
seems that commit e3b37f11e6e4e6b6 ("netfilter: replace list_head with
single linked list") breaks the build on !CONFIG_NETFILTER_INGRESS systems
accessing ->nf_hooks_ingress
static void nf_set_hooks_head(struct net *net, const struct nf_hook_ops *reg,
struct nf_hook_entry *entry)
{
switch (reg->pf) {
case NFPROTO_NETDEV:
/* We already checked in nf_register_net_hook() that this is
* used from ingress.
*/
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^^^^^^^^^^^^^^^^^^^^
log:
In file included from ./include/linux/linkage.h:4:0,
from ./include/linux/kernel.h:6,
from net/netfilter/core.c:10:
net/netfilter/core.c: In function ‘nf_set_hooks_head’:
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:322:17: note: in definition of macro ‘WRITE_ONCE’
union { typeof(x) __val; char __c[1]; } __u = \
^
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:323:30: note: in definition of macro ‘WRITE_ONCE’
{ .__val = (__force typeof(x)) (val) }; \
^
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:323:35: note: in definition of macro ‘WRITE_ONCE’
{ .__val = (__force typeof(x)) (val) }; \
^~~
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:324:22: note: in definition of macro ‘WRITE_ONCE’
__write_once_size(&(x), __u.__c, sizeof(x)); \
^
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:324:42: note: in definition of macro ‘WRITE_ONCE’
__write_once_size(&(x), __u.__c, sizeof(x)); \
^
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
In file included from ./include/linux/linkage.h:4:0,
from ./include/linux/kernel.h:6,
from net/netfilter/core.c:10:
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:498:19: note: in definition of macro ‘__compiletime_assert’
bool __cond = !(condition); \
^~~~~~~~~
./include/linux/compiler.h:518:2: note: in expansion of macro ‘_compiletime_assert’
_compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
^~~~~~~~~~~~~~~~~~~
./include/linux/compiler.h:521:2: note: in expansion of macro ‘compiletime_assert’
compiletime_assert(__native_word(t), \
^~~~~~~~~~~~~~~~~~
./include/linux/compiler.h:521:21: note: in expansion of macro ‘__native_word’
compiletime_assert(__native_word(t), \
^~~~~~~~~~~~~
./arch/x86/include/asm/barrier.h:64:2: note: in expansion of macro ‘compiletime_assert_atomic_type’
compiletime_assert_atomic_type(*p); \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/asm-generic/barrier.h:157:33: note: in expansion of macro ‘__smp_store_release’
#define smp_store_release(p, v) __smp_store_release(p, v)
^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:668:3: note: in expansion of macro ‘smp_store_release’
smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
^~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:498:19: note: in definition of macro ‘__compiletime_assert’
bool __cond = !(condition); \
^~~~~~~~~
./include/linux/compiler.h:518:2: note: in expansion of macro ‘_compiletime_assert’
_compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
^~~~~~~~~~~~~~~~~~~
./include/linux/compiler.h:521:2: note: in expansion of macro ‘compiletime_assert’
compiletime_assert(__native_word(t), \
^~~~~~~~~~~~~~~~~~
./include/linux/compiler.h:521:21: note: in expansion of macro ‘__native_word’
compiletime_assert(__native_word(t), \
^~~~~~~~~~~~~
./arch/x86/include/asm/barrier.h:64:2: note: in expansion of macro ‘compiletime_assert_atomic_type’
compiletime_assert_atomic_type(*p); \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/asm-generic/barrier.h:157:33: note: in expansion of macro ‘__smp_store_release’
#define smp_store_release(p, v) __smp_store_release(p, v)
^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:668:3: note: in expansion of macro ‘smp_store_release’
smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
^~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:498:19: note: in definition of macro ‘__compiletime_assert’
bool __cond = !(condition); \
^~~~~~~~~
./include/linux/compiler.h:518:2: note: in expansion of macro ‘_compiletime_assert’
_compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
^~~~~~~~~~~~~~~~~~~
./include/linux/compiler.h:521:2: note: in expansion of macro ‘compiletime_assert’
compiletime_assert(__native_word(t), \
^~~~~~~~~~~~~~~~~~
./include/linux/compiler.h:521:21: note: in expansion of macro ‘__native_word’
compiletime_assert(__native_word(t), \
^~~~~~~~~~~~~
./arch/x86/include/asm/barrier.h:64:2: note: in expansion of macro ‘compiletime_assert_atomic_type’
compiletime_assert_atomic_type(*p); \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/asm-generic/barrier.h:157:33: note: in expansion of macro ‘__smp_store_release’
#define smp_store_release(p, v) __smp_store_release(p, v)
^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:668:3: note: in expansion of macro ‘smp_store_release’
smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
^~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:498:19: note: in definition of macro ‘__compiletime_assert’
bool __cond = !(condition); \
^~~~~~~~~
./include/linux/compiler.h:518:2: note: in expansion of macro ‘_compiletime_assert’
_compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
^~~~~~~~~~~~~~~~~~~
./include/linux/compiler.h:521:2: note: in expansion of macro ‘compiletime_assert’
compiletime_assert(__native_word(t), \
^~~~~~~~~~~~~~~~~~
./include/linux/compiler.h:521:21: note: in expansion of macro ‘__native_word’
compiletime_assert(__native_word(t), \
^~~~~~~~~~~~~
./arch/x86/include/asm/barrier.h:64:2: note: in expansion of macro ‘compiletime_assert_atomic_type’
compiletime_assert_atomic_type(*p); \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/asm-generic/barrier.h:157:33: note: in expansion of macro ‘__smp_store_release’
#define smp_store_release(p, v) __smp_store_release(p, v)
^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:668:3: note: in expansion of macro ‘smp_store_release’
smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
^~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
In file included from ./include/linux/linkage.h:4:0,
from ./include/linux/kernel.h:6,
from net/netfilter/core.c:10:
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:322:17: note: in definition of macro ‘WRITE_ONCE’
union { typeof(x) __val; char __c[1]; } __u = \
^
./include/asm-generic/barrier.h:157:33: note: in expansion of macro ‘__smp_store_release’
#define smp_store_release(p, v) __smp_store_release(p, v)
^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:668:3: note: in expansion of macro ‘smp_store_release’
smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
^~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:323:30: note: in definition of macro ‘WRITE_ONCE’
{ .__val = (__force typeof(x)) (val) }; \
^
./include/asm-generic/barrier.h:157:33: note: in expansion of macro ‘__smp_store_release’
#define smp_store_release(p, v) __smp_store_release(p, v)
^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:668:3: note: in expansion of macro ‘smp_store_release’
smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
^~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:323:35: note: in definition of macro ‘WRITE_ONCE’
{ .__val = (__force typeof(x)) (val) }; \
^~~
./include/asm-generic/barrier.h:157:33: note: in expansion of macro ‘__smp_store_release’
#define smp_store_release(p, v) __smp_store_release(p, v)
^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:668:3: note: in expansion of macro ‘smp_store_release’
smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
^~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:668:25: note: in expansion of macro ‘RCU_INITIALIZER’
smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
^~~~~~~~~~~~~~~
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:323:35: note: in definition of macro ‘WRITE_ONCE’
{ .__val = (__force typeof(x)) (val) }; \
^~~
./include/asm-generic/barrier.h:157:33: note: in expansion of macro ‘__smp_store_release’
#define smp_store_release(p, v) __smp_store_release(p, v)
^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:668:3: note: in expansion of macro ‘smp_store_release’
smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
^~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:668:25: note: in expansion of macro ‘RCU_INITIALIZER’
smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
^~~~~~~~~~~~~~~
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:324:22: note: in definition of macro ‘WRITE_ONCE’
__write_once_size(&(x), __u.__c, sizeof(x)); \
^
./include/asm-generic/barrier.h:157:33: note: in expansion of macro ‘__smp_store_release’
#define smp_store_release(p, v) __smp_store_release(p, v)
^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:668:3: note: in expansion of macro ‘smp_store_release’
smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
^~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:30: error: ‘struct net_device’ has no member named ‘nf_hooks_ingress’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^
./include/linux/compiler.h:324:42: note: in definition of macro ‘WRITE_ONCE’
__write_once_size(&(x), __u.__c, sizeof(x)); \
^
./include/asm-generic/barrier.h:157:33: note: in expansion of macro ‘__smp_store_release’
#define smp_store_release(p, v) __smp_store_release(p, v)
^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:668:3: note: in expansion of macro ‘smp_store_release’
smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
^~~~~~~~~~~~~~~~~
net/netfilter/core.c:96:3: note: in expansion of macro ‘rcu_assign_pointer’
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
^~~~~~~~~~~~~~~~~~
CC net/ipv4/ip_fragment.o
make[2]: *** [scripts/Makefile.build:290: net/netfilter/core.o] Error 1
make[1]: *** [scripts/Makefile.build:475: net/netfilter] Error 2
make[1]: *** Waiting for unfinished jobs....
-ss
^ permalink raw reply
* Re: linux-next: build failure after merge of the rdma tree
From: Christoph Hellwig @ 2016-09-27 13:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Christoph Hellwig, Doug Ledford, linux-next, linux-kernel
In-Reply-To: <20160927154820.11d17334@canb.auug.org.au>
On Tue, Sep 27, 2016 at 03:48:20PM +1000, Stephen Rothwell wrote:
> Yeah, sorry. Note, however, that you bothered to fix up this same
> staging file in another of your patches ...
It's generally not that I don't fix them up because I hate them, it's
just because they are doing something so incredibly stupid that it would
take forever to fix up (and something that would have been could if it
ever had been through review). For this particular case I think everyone
would be served much better if this module was simply dropped from the
tree, as there will be lots of future patches that will break it.
^ permalink raw reply
* Re: next-20160927 build: 2 failures 4 warnings (next-20160927)
From: Mark Brown @ 2016-09-27 16:00 UTC (permalink / raw)
To: Marcin Niestroj, Grygorii Strashko, Tony Lindgren, Lee Jones,
arnd, Thomas Gleixner
Cc: kernel-build-reports, linaro-kernel, linux-next, linux-arm-kernel
In-Reply-To: <E1bop0x-0001YK-4h@optimist>
[-- Attachment #1: Type: text/plain, Size: 661 bytes --]
On Tue, Sep 27, 2016 at 10:49:27AM +0100, Build bot for Mark Brown wrote:
-next is still failing to build an arm and arm64 allmodconfig due to:
> arm64-allmodconfig
> ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
> arm-allmodconfig
> ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
due to 262d5cc6ceb293 (mfd: tps65217: Add support for IRQs) since
irq_set_parent() isn't exported. There was a fix posted adding the
export to the IRQ subsystem but it's still not been applied, the
function is being used in order to enable lazy IRQ disabling for
threaded interrupts:
https://www.spinics.net/lists/arm-kernel/msg532864.html
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the rdma tree
From: Doug Ledford @ 2016-09-27 17:15 UTC (permalink / raw)
To: Christoph Hellwig, Stephen Rothwell
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20160927133949.GA21231@lst.de>
[-- Attachment #1.1: Type: text/plain, Size: 926 bytes --]
On 9/27/16 9:39 AM, Christoph Hellwig wrote:
> On Tue, Sep 27, 2016 at 03:48:20PM +1000, Stephen Rothwell wrote:
>> Yeah, sorry. Note, however, that you bothered to fix up this same
>> staging file in another of your patches ...
>
> It's generally not that I don't fix them up because I hate them, it's
> just because they are doing something so incredibly stupid that it would
> take forever to fix up (and something that would have been could if it
> ever had been through review). For this particular case I think everyone
> would be served much better if this module was simply dropped from the
> tree, as there will be lots of future patches that will break it.
>
I don't know that I would drop them, but certainly turn them off. They
can keep their driver up to date.
--
Doug Ledford <dledford@redhat.com> GPG Key ID: 0E572FDD
Red Hat, Inc.
100 E. Davie St
Raleigh, NC 27601 USA
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 907 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the gpio tree with the arm-soc tree
From: Tony Lindgren @ 2016-09-27 19:16 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linus Walleij, Olof Johansson, Arnd Bergmann, ARM, linux-next,
linux-kernel
In-Reply-To: <20160927150542.7e81e7ee@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [160926 22:06]:
> Hi Linus,
>
> Today's linux-next merge of the gpio tree got a conflict in:
>
> arch/arm/mach-omap2/board-rx51-peripherals.c
>
> between commit:
>
> 9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900")
>
> from the arm-soc tree and commit:
>
> 9132ce450bd1 ("ARM: omap2: fix missing include")
>
> from the gpio tree.
>
> I fixed it up (the former removed the file, so I did that) 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.
Yes thanks removing it the way to go.
Regards,
Tony
^ permalink raw reply
* Re: next-20160927 build: 2 failures 4 warnings (next-20160927)
From: Lee Jones @ 2016-09-27 19:36 UTC (permalink / raw)
To: Mark Brown
Cc: Marcin Niestroj, Grygorii Strashko, Tony Lindgren, arnd,
Thomas Gleixner, kernel-build-reports, linaro-kernel, linux-next,
linux-arm-kernel
In-Reply-To: <20160927160036.y3ti3gzt4ebg2vyz@sirena.org.uk>
On Tue, 27 Sep 2016, Mark Brown wrote:
> On Tue, Sep 27, 2016 at 10:49:27AM +0100, Build bot for Mark Brown wrote:
>
> -next is still failing to build an arm and arm64 allmodconfig due to:
>
> > arm64-allmodconfig
> > ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
>
> > arm-allmodconfig
> > ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
>
> due to 262d5cc6ceb293 (mfd: tps65217: Add support for IRQs) since
> irq_set_parent() isn't exported. There was a fix posted adding the
> export to the IRQ subsystem but it's still not been applied, the
> function is being used in order to enable lazy IRQ disabling for
> threaded interrupts:
>
> https://www.spinics.net/lists/arm-kernel/msg532864.html
Right H-hour is fast approaching. How are we going to resolve this?
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply
* Re: linux-next: manual merge of the percpu tree with the asm-generic tree
From: Arnd Bergmann @ 2016-09-27 19:59 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar,
linux-next, linux-kernel, Chunyan Zhang, Nicholas Piggin
In-Reply-To: <20160927135434.0040b41c@canb.auug.org.au>
On Tuesday 27 September 2016, Stephen Rothwell wrote:
> diff --cc include/asm-generic/percpu.h
> index 70fefec69e61,40e887068da2..000000000000
> --- a/include/asm-generic/percpu.h
> +++ b/include/asm-generic/percpu.h
> @@@ -108,9 -118,9 +118,9 @@@ do {
> #define this_cpu_generic_read(pcp) \
> ({ \
> typeof(pcp) __ret; \
> - preempt_disable(); \
> + preempt_disable_notrace(); \
> - __ret = *this_cpu_ptr(&(pcp)); \
> + __ret = raw_cpu_generic_read(pcp); \
> - preempt_enable(); \
> + preempt_enable_notrace(); \
> __ret; \
> })
>
The merge solution seems correct, but this is one of only two trivial
patches I have queued up for asm-generic this time, so I wonder if we could
put the _notrace patch into the percpu tree that already has the
raw_cpu_generic_read change to avoid the conflict.
Arnd
^ permalink raw reply
* Re: linux-next: manual merge of the percpu tree with the asm-generic tree
From: Tejun Heo @ 2016-09-27 20:01 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Stephen Rothwell, Rusty Russell, Christoph Lameter, Ingo Molnar,
linux-next, linux-kernel, Chunyan Zhang, Nicholas Piggin
In-Reply-To: <201609272159.32261.arnd@arndb.de>
Hello, Arnd.
On Tue, Sep 27, 2016 at 09:59:32PM +0200, Arnd Bergmann wrote:
> The merge solution seems correct, but this is one of only two trivial
> patches I have queued up for asm-generic this time, so I wonder if we could
> put the _notrace patch into the percpu tree that already has the
> raw_cpu_generic_read change to avoid the conflict.
I'll be happy to pick it up. Can you please send me the patch
refreshed on top of percpu/for-4.9?
Thanks.
--
tejun
^ permalink raw reply
* mmotm 2016-09-27-16-08 uploaded
From: akpm @ 2016-09-27 23:09 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-09-27-16-08 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.8-rc8:
(patches marked "*" will be included in linux-next)
i-need-old-gcc.patch
* mmksm-fix-endless-looping-in-allocating-memory-when-ksm-enable.patch
* dma-mappingh-preserve-unmap-info-for-config_dma_api_debug.patch
* scripts-recordmcountc-account-for-softirqentrytext.patch
* mem-hotplug-use-nodes-that-contain-memory-as-mask-in-new_node_page.patch
* mm-workingset-fix-crash-in-shadow-node-shrinker-caused-by-replace_page_cache_page.patch
* ocfs2-fix-deadlock-on-mmapped-page-in-ocfs2_write_begin_nolock.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* fsnotify-drop-notification_mutex-before-destroying-event.patch
* fsnotify-convert-notification_mutex-to-a-spinlock.patch
* fsnotify-convert-notification_mutex-to-a-spinlock-fix.patch
* fanotify-use-notification_lock-instead-of-access_lock.patch
* fanotify-fix-possible-false-warning-when-freeing-events.patch
* fsnotify-cleanup-spinlock-assertions.patch
* kbuild-simpler-generation-of-assembly-constants.patch
* fs-ocfs2-dlmfs-remove-deprecated-create_singlethread_workqueue.patch
* fs-ocfs2-cluster-remove-deprecated-create_singlethread_workqueue.patch
* fs-ocfs2-super-remove-deprecated-create_singlethread_workqueue.patch
* fs-ocfs2-dlm-remove-deprecated-create_singlethread_workqueue.patch
* ocfs2-fix-undefined-struct-variable-in-inodeh.patch
* ocfs2-free-the-mle-while-the-res-had-one-to-avoid-mle-memory-leak.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* fs-select-add-vmalloc-fallback-for-select2.patch
* kernel-watchdog-use-nmi-registers-snapshot-in-hardlockup-handler.patch
mm.patch
* mm-oom-deduplicate-victim-selection-code-for-memcg-and-global-oom.patch
* mm-zsmalloc-add-trace-events-for-zs_compact.patch
* mm-zsmalloc-add-per-class-compact-trace-event.patch
* mm-vmalloc-fix-align-value-calculation-error.patch
* mm-vmalloc-fix-align-value-calculation-error-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix-fix.patch
* mm-memcontrol-add-sanity-checks-for-memcg-idref-on-get-put.patch
* mm-oom_killc-fix-task_will_free_mem-comment.patch
* mm-compaction-make-whole_zone-flag-ignore-cached-scanner-positions.patch
* mm-compaction-make-whole_zone-flag-ignore-cached-scanner-positions-checkpatch-fixes.patch
* mm-compaction-cleanup-unused-functions.patch
* mm-compaction-rename-compact_partial-to-compact_success.patch
* mm-compaction-dont-recheck-watermarks-after-compact_success.patch
* mm-compaction-add-the-ultimate-direct-compaction-priority.patch
* mm-compaction-add-the-ultimate-direct-compaction-priority-fix.patch
* mm-compaction-use-correct-watermark-when-checking-compaction-success.patch
* mm-compaction-create-compact_gap-wrapper.patch
* mm-compaction-create-compact_gap-wrapper-fix.patch
* mm-compaction-use-proper-alloc_flags-in-__compaction_suitable.patch
* mm-compaction-require-only-min-watermarks-for-non-costly-orders.patch
* mm-compaction-require-only-min-watermarks-for-non-costly-orders-fix.patch
* mm-vmscan-make-compaction_ready-more-accurate-and-readable.patch
* mem-hotplug-fix-node-spanned-pages-when-we-have-a-movable-node.patch
* mm-fix-set-pageblock-migratetype-in-deferred-struct-page-init.patch
* mm-vmscan-get-rid-of-throttle_vm_writeout.patch
* mm-debug_pagealloc-clean-up-guard-page-handling-code.patch
* mm-debug_pagealloc-dont-allocate-page_ext-if-we-dont-use-guard-page.patch
* mm-page_owner-move-page_owner-specific-function-to-page_ownerc.patch
* mm-page_ext-rename-offset-to-index.patch
* mm-page_ext-support-extra-space-allocation-by-page_ext-user.patch
* mm-page_owner-dont-define-fields-on-struct-page_ext-by-hard-coding.patch
* do_generic_file_read-fail-immediately-if-killed.patch
* mm-pagewalk-fix-the-comment-for-test_walk.patch
* mm-unrig-vma-cache-hit-ratio.patch
* mm-swap-add-swap_cluster_list.patch
* mm-swap-add-swap_cluster_list-checkpatch-fixes.patch
* mmoom_reaper-reduce-find_lock_task_mm-usage.patch
* mmoom_reaper-do-not-attempt-to-reap-a-task-twice.patch
* oom-keep-mm-of-the-killed-task-available.patch
* kernel-oom-fix-potential-pgd_lock-deadlock-from-__mmdrop.patch
* mm-oom-get-rid-of-signal_struct-oom_victims.patch
* oom-suspend-fix-oom_killer_disable-vs-pm-suspend-properly.patch
* mm-oom-enforce-exit_oom_victim-on-current-task.patch
* mm-make-sure-that-kthreads-will-not-refault-oom-reaped-memory.patch
* oom-oom_reaper-allow-to-reap-mm-shared-by-the-kthreads.patch
* mm-use-zonelist-name-instead-of-using-hardcoded-index.patch
* mm-introduce-arch_reserved_kernel_pages.patch
* mm-memblock-expose-total-reserved-memory.patch
* powerpc-implement-arch_reserved_kernel_pages.patch
* mm-nobootmemc-remove-duplicate-macro-arch_low_address_limit-statements.patch
* mm-bootmemc-replace-kzalloc-by-kzalloc_node.patch
* mm-dont-use-radix-tree-writeback-tags-for-pages-in-swap-cache.patch
* oom-warn-if-we-go-oom-for-higher-order-and-compaction-is-disabled.patch
* mm-mlock-check-against-vma-for-actual-mlock-size.patch
* mm-mlock-check-against-vma-for-actual-mlock-size-fix.patch
* mm-mlock-check-against-vma-for-actual-mlock-size-fix-2.patch
* mm-mlock-avoid-increase-mm-locked_vm-on-mlock-when-already-mlock2mlock_onfault.patch
* selftest-split-mlock2_-funcs-into-separate-mlock2h.patch
* selftests-vm-add-test-for-mlock-when-areas-are-intersected.patch
* selftest-move-seek_to_smaps_entry-out-of-mlock2-testsc.patch
* selftests-expanding-more-mlock-selftest.patch
* thp-dax-add-thp_get_unmapped_area-for-pmd-mappings.patch
* ext2-4-xfs-call-thp_get_unmapped_area-for-pmd-mappings.patch
* cpu-fix-node-state-for-whether-it-contains-cpu.patch
* mm-proc-make-the-task_mmu-walk_page_range-limit-in-clear_refs_write-obvious.patch
* thp-reduce-usage-of-huge-zero-pages-atomic-counter.patch
* mm-memcontrol-make-the-walk_page_range-limit-obvious.patch
* memory-hotplug-fix-store_mem_state-return-value.patch
* mm-fix-cache-mode-tracking-in-vm_insert_mixed.patch
* mm-swap-use-offset-of-swap-entry-as-key-of-swap-cache.patch
* mm-remove-page_file_index.patch
* revert-mm-oom-prevent-premature-oom-killer-invocation-for-high-order-request.patch
* mm-compaction-more-reliably-increase-direct-compaction-priority.patch
* mm-compaction-more-reliably-increase-direct-compaction-priority-fix.patch
* mm-compaction-restrict-full-priority-to-non-costly-orders.patch
* mm-compaction-make-full-priority-ignore-pageblock-suitability.patch
* mm-page_alloc-pull-no_progress_loops-update-to-should_reclaim_retry.patch
* mm-compaction-ignore-fragindex-from-compaction_zonelist_suitable.patch
* mm-compaction-restrict-fragindex-to-costly-orders.patch
* mm-dont-emit-warning-from-pagefault_out_of_memory.patch
* mm-page_ioc-replace-some-bug_ons-with-vm_bug_on_page.patch
* fs-use-mapping_set_error-instead-of-opencoded-set_bit.patch
* fs-use-mapping_set_error-instead-of-opencoded-set_bit-fix.patch
* mm-split-gfp_mask-and-mapping-flags-into-separate-fields.patch
* mm-move-phys_mem_access_prot_allowed-declaration-to-pgtableh.patch
* fs-bufferc-make-__getblk_slow-static.patch
* mm-memcontrol-consolidate-cgroup-socket-tracking.patch
* mm-memcontrol-consolidate-cgroup-socket-tracking-fix-2.patch
* mm-memcontrol-consolidate-cgroup-socket-tracking-checkpatch-fixes.patch
* mm-shmemc-constify-anon_ops.patch
* mm-nobootmem-move-the-comment-of-free_all_bootmem.patch
* mm-hugetlb-fix-memory-offline-with-hugepage-size-memory-block-size.patch
* mm-hugetlb-check-for-reserved-hugepages-during-memory-offline.patch
* mm-hugetlb-improve-locking-in-dissolve_free_huge_pages.patch
* mm-page_isolation-fix-typo-paes-pages.patch
* mm-percpuc-correct-max_distance-calculation-for-pcpu_embed_first_chunk.patch
* mmksm-add-__gfp_high-to-the-allocation-in-alloc_stable_node.patch
* mm-vm_page_prot-update-with-write_once-read_once.patch
* mm-vma_adjust-remove-superfluous-confusing-update-in-remove_next-==-1-case.patch
* mm-vma_merge-fix-vm_page_prot-smp-race-condition-against-rmap_walk.patch
* mm-vma_adjust-remove-superfluous-check-for-next-not-null.patch
* mm-vma_adjust-minor-comment-correction.patch
* mm-vma_merge-correct-false-positive-from-__vma_unlink-validate_mm_rb.patch
* mm-clarify-why-we-avoid-page_mapcount-for-slab-pages-in-dump_page.patch
* mm-page_owner-align-with-pageblock_nr-pages.patch
* mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
* ia64-implement-atomic64_dec_if_positive.patch
* atomic64-no-need-for-config_arch_has_atomic64_dec_if_positive.patch
* proc-much-faster-proc-vmstat.patch
* proc-faster-proc-status.patch
* seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char.patch
* seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char-fix.patch
* meminfo-break-apart-a-very-long-seq_printf-with-ifdefs.patch
* proc-relax-proc-tid-timerslack_ns-capability-requirements.patch
* proc-add-lsm-hook-checks-to-proc-tid-timerslack_ns.patch
* proc-fix-timerslack_ns-cap_sys_nice-check-when-adjusting-self.patch
* proc-unsigned-file-descriptors.patch
* min-max-remove-sparse-warnings-when-theyre-nested.patch
* nmi_backtrace-add-more-trigger__cpu_backtrace-methods.patch
* nmi_backtrace-do-a-local-dump_stack-instead-of-a-self-nmi.patch
* arch-tile-adopt-the-new-nmi_backtrace-framework.patch
* nmi_backtrace-generate-one-line-reports-for-idle-cpus.patch
* spellingtxt-modeled-is-spelt-correctly.patch
* uprobes-remove-function-declarations-from-arch-mipss390.patch
* set-git-diff-driver-for-c-source-code-files.patch
* mailmap-add-johan-hovold.patch
* cred-simpler-1d-supplementary-groups.patch
* console-dont-prefer-first-registered-if-dt-specifies-stdout-path.patch
* radix-tree-slot-can-be-null-in-radix_tree_next_slot.patch
* radix-tree-tests-add-iteration-test.patch
* radix-tree-tests-properly-initialize-mutex.patch
* lib-harden-strncpy_from_user.patch
* make-isdigit-table-lookupless.patch
* kstrtox-smaller-_parse_integer.patch
* lib-bitmapc-enhance-bitmap-syntax.patch
* lib-bitmapc-enhance-bitmap-syntax-fix.patch
* include-linux-provide-a-safe-version-of-container_of.patch
* llist-introduce-llist_entry_safe.patch
* lib-add-crc64-ecma-module.patch
* compat-remove-compat_printk.patch
* checkpatch-see-if-modified-files-are-marked-obsolete-in-maintainers.patch
* checkpatch-look-for-symbolic-permissions-and-suggest-octal-instead.patch
* checkpatch-test-multiple-line-block-comment-alignment.patch
* checkpatch-dont-test-for-prefer-ether_addr_foo.patch
* checkpatch-externalize-the-structs-that-should-be-const.patch
* const_structscheckpatch-add-frequently-used-from-julia-lawalls-list.patch
* checkpatch-speed-up-checking-for-filenames-in-sections-marked-obsolete.patch
* checkpatch-improve-the-block-comment-alignment-test.patch
* checkpatch-add-strict-test-for-macro-argument-reuse.patch
* checkpatch-add-strict-test-for-precedence-challenged-macro-arguments.patch
* checkpatch-improve-macro_arg_precedence-test.patch
* checkpatch-add-warning-for-unnamed-function-definition-arguments.patch
* kprobes-include-asm-sectionsh-instead-of-asm-generic-sectionsh.patch
* autofs-fix-typos-in-documentation-filesystems-autofs4txt.patch
* autofs-drop-unnecessary-extern-in-autofs_ih.patch
* autofs-test-autofs-versions-first-on-sb-initialization.patch
* autofs-fix-autofs4_fill_super-error-exit-handling.patch
* autofs-add-warn_on1-for-non-dir-link-inode-case.patch
* autofs-remove-ino-free-in-autofs4_dir_symlink.patch
* autofs-use-autofs4_free_ino-to-kfree-dentry-data.patch
* autofs-remove-obsolete-sb-fields.patch
* autofs-dont-fail-to-free_dev_ioctlparam.patch
* autofs-remove-autofs_devid_len.patch
* autofs-fix-documentation-regarding-devid-on-ioctl.patch
* autofs-update-struct-autofs_dev_ioctl-in-documentation.patch
* autofs-fix-pr_debug-message.patch
* autofs-fix-dev-ioctl-number-range-check.patch
* autofs-fix-dev-ioctl-number-range-check-fix.patch
* autofs-add-autofs_dev_ioctl_version-for-autofs_dev_ioctl_version_cmd.patch
* autofs-fix-print-format-for-ioctl-warning-message.patch
* autofs-move-inclusion-of-linux-limitsh-to-uapi.patch
* autofs4-move-linux-auto_dev-ioctlh-to-uapi-linux.patch
* autofs-remove-possibly-misleading-define-debug.patch
* autofs-refactor-ioctl-fn-vector-in-iookup_dev_ioctl.patch
* fs-make-is_local_mountpoint-usable-by-others.patch
* fs-add-have_local_submounts.patch
* autofs-make-mountpoint-checks-namespace-aware.patch
* fs-remove-unused-have_submounts-function.patch
* pipe-relocate-round_pipe_size-above-pipe_set_size.patch
* pipe-move-limit-checking-logic-into-pipe_set_size.patch
* pipe-refactor-argument-for-account_pipe_buffers.patch
* pipe-fix-limit-checking-in-pipe_set_size.patch
* pipe-simplify-logic-in-alloc_pipe_info.patch
* pipe-fix-limit-checking-in-alloc_pipe_info.patch
* pipe-make-account_pipe_buffers-return-a-value-and-use-it.patch
* pipe-cap-initial-pipe-capacity-according-to-pipe-max-size-limit.patch
* ptrace-clear-tif_syscall_trace-on-ptrace-detach.patch
* kexec_file-allow-arch-specific-memory-walking-for-kexec_add_buffer.patch
* kexec_file-change-kexec_add_buffer-to-take-kexec_buf-as-argument.patch
* kexec_file-factor-out-kexec_locate_mem_hole-from-kexec_add_buffer.patch
* powerpc-change-places-using-config_kexec-to-use-config_kexec_core-instead.patch
* powerpc-factor-out-relocation-code-from-module_64c-to-elf_util_64c.patch
* powerpc-generalize-elf64_apply_relocate_add.patch
* powerpc-adapt-elf64_apply_relocate_add-for-kexec_file_load.patch
* powerpc-add-functions-to-read-elf-files-of-any-endianness.patch
* powerpc-implement-kexec_file_load.patch
* powerpc-add-code-to-work-with-device-trees-in-kexec_file_load.patch
* powerpc-add-support-for-loading-elf-kernels-with-kexec_file_load.patch
* powerpc-add-support-for-loading-elf-kernels-with-kexec_file_load-fix.patch
* powerpc-add-purgatory-for-kexec_file_load-implementation.patch
* powerpc-add-purgatory-for-kexec_file_load-implementation-fix.patch
* powerpc-enable-config_kexec_file-in-powerpc-server-defconfigs.patch
* kexec_file-include-the-purgatory-segment-in-the-kexec-image-checksum.patch
* kexec_file-add-buffer-hand-over-support-for-the-next-kernel.patch
* powerpc-kexec_file-add-buffer-hand-over-support-for-the-next-kernel.patch
* kexec_file-add-mechanism-to-update-kexec-segments.patch
* ima-on-soft-reboot-restore-the-measurement-list.patch
* ima-permit-duplicate-measurement-list-entries.patch
* ima-maintain-memory-size-needed-for-serializing-the-measurement-list.patch
* ima-serialize-the-binary_runtime_measurements.patch
* ima-on-soft-reboot-save-the-measurement-list.patch
* ima-store-the-builtin-custom-template-definitions-in-a-list.patch
* ima-support-restoring-multiple-template-formats.patch
* ima-define-a-canonical-binary_runtime_measurements-list-format.patch
* ima-platform-independent-hash-value.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* rapidio-rio_cm-use-memdup_user-instead-of-duplicating-code.patch
* random-simplify-api-for-random-address-requests.patch
* x86-use-simpler-api-for-random-address-requests.patch
* arm-use-simpler-api-for-random-address-requests.patch
* arm64-use-simpler-api-for-random-address-requests.patch
* tile-use-simpler-api-for-random-address-requests.patch
* unicore32-use-simpler-api-for-random-address-requests.patch
* random-remove-unused-randomize_range.patch
* dma-mapping-introduce-the-dma_attr_no_warn-attribute.patch
* powerpc-implement-the-dma_attr_no_warn-attribute.patch
* nvme-use-the-dma_attr_no_warn-attribute.patch
* x86-panic-replace-smp_send_stop-with-kdump-friendly-version-in-panic-path.patch
* mips-panic-replace-smp_send_stop-with-kdump-friendly-version-in-panic-path.patch
* pps-kc-fix-non-tickless-system-config-dependency.patch
* relay-use-irq_work-instead-of-plain-timer-for-deferred-wakeup.patch
* relay-use-irq_work-instead-of-plain-timer-for-deferred-wakeup-fix.patch
* relay-use-irq_work-instead-of-plain-timer-for-deferred-wakeup-checkpatch-fixes.patch
* config-android-remove-config_ipv6_privacy.patch
* config-android-move-device-mapper-options-to-recommended.patch
* config-android-set-selinux-as-default-security-mode.patch
* config-android-enable-config_seccomp.patch
* kcov-do-not-instrument-lib-stackdepotc.patch
* ipc-semc-fix-complex_count-vs-simple-op-race.patch
* ipc-msg-implement-lockless-pipelined-wakeups.patch
* ipc-msg-batch-queue-sender-wakeups.patch
* ipc-msg-make-ss_wakeup-kill-arg-boolean.patch
* ipc-msg-lockless-security-checks-for-msgsnd.patch
* ipc-msg-avoid-waking-sender-upon-full-queue.patch
* ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes.patch
linux-next.patch
linux-next-rejects.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* include-linux-mlx5-deviceh-kill-build_bug_ons.patch
* kdump-vmcoreinfo-report-memory-sections-virtual-addresses.patch
* mm-kmemleak-avoid-using-__va-on-addresses-that-dont-have-a-lowmem-mapping.patch
* enable-code-completion-in-vim.patch
* kthread-add-kerneldoc-for-kthread_create.patch
* hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0.patch
* hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix.patch
* treewide-remove-redundant-include-linux-kconfigh.patch
mm-add-strictlimit-knob-v2.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* Re: linux-next: build failure after merge of the rdma tree
From: Stephen Rothwell @ 2016-09-28 1:43 UTC (permalink / raw)
To: Doug Ledford
Cc: linux-next, linux-kernel, Christoph Hellwig, Greg KH, Oleg Drokin,
Andreas Dilger
In-Reply-To: <20160927112334.3615159e@canb.auug.org.au>
Hi Stephen,
On Tue, 27 Sep 2016 11:23:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Doug,
>
> After merging the rdma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_hdev_setup_mrs':
> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2317:7: error: implicit declaration of function 'ib_get_dma_mr' [-Werror=implicit-function-declaration]
> mr = ib_get_dma_mr(hdev->ibh_pd, acflags);
> ^
> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2317:5: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
> mr = ib_get_dma_mr(hdev->ibh_pd, acflags);
> ^
>
> Caused by commit
>
> 5ef990f06bd7 ("IB/core: remove ib_get_dma_mr")
>
> I have used the rdma tree from next-20160923 for today.
As pointed out by Christoph, I should have just disabled the driver in
staging, so today I just applied the patch below. Doug, that should
probably be applied to the rdma tree so that you don't break Linus'
tree when it gets merged.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2016 11:35:28 +1000
Subject: [PATCH] starging/lustre: disable LNET infiniband support
Commit 5ef990f06bd7 ("IB/core: remove ib_get_dma_mr") broke the
lustre LNET infiniband support. Since this is in drivers/staging,
lets just disable it for now until ti can be fixed properly.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/staging/lustre/lnet/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/staging/lustre/lnet/Kconfig b/drivers/staging/lustre/lnet/Kconfig
index 2b5930150cda..13b43278a38d 100644
--- a/drivers/staging/lustre/lnet/Kconfig
+++ b/drivers/staging/lustre/lnet/Kconfig
@@ -35,6 +35,7 @@ config LNET_SELFTEST
config LNET_XPRT_IB
tristate "LNET infiniband support"
depends on LNET && INFINIBAND && INFINIBAND_ADDR_TRANS
+ depends on BROKEN
default LNET && INFINIBAND
help
This option allows the LNET users to use infiniband as an
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: manual merge of the drm tree with Linus' tree
From: Stephen Rothwell @ 2016-09-28 1:57 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Daniel Vetter
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/drm_crtc.c
between commit:
6f00975c6190 ("drm: Reject page_flip for !DRIVER_MODESET")
from Linus' tree and commit:
43968d7b806d ("drm: Extract drm_plane.[hc]")
from the drm tree.
I fixed it up (the latter takes the former into account, so I just used
the drm tree version) and can carry the fix as necessary. This is now
fixed as far as linux-next is concerned, but any non trivial conflicts
should be mentioned to your upstream maintainer when your tree is
submitted for merging. You may also want to consider cooperating with
the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the drm-misc tree with the drm tree
From: Stephen Rothwell @ 2016-09-28 2:11 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: linux-next, linux-kernel, Dave Airlie, Ville Syrjälä,
Baoyou Xie, Sean Paul, Vincent Abriou
Hi all,
Today's linux-next merge of the drm-misc tree got conflicts in:
drivers/gpu/drm/sti/sti_dvo.c
drivers/gpu/drm/sti/sti_hqvdp.c
drivers/gpu/drm/sti/sti_mixer.c
between commits:
bdfd36ef8e64 ("drm/sti: Fix sparse warnings")
b4bba92dfbe2 ("drm/sti: remove stih415-416 platform support")
from the drm tree and commit:
bd233af436ba ("drm/sti: mark symbols static where possible")
from the drm-misc tree.
I fixed it up (I just used the drm-misc tree versions and removed the
comflicting function in the sti_mixer.c case) 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 vfs-miklos tree
From: Stephen Rothwell @ 2016-09-28 5:00 UTC (permalink / raw)
To: Greg KH, Miklos Szeredi
Cc: linux-next, linux-kernel, Al Viro, Prakash Surya, John L. Hammond
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/lustre/lustre/llite/file.c
between commit:
302d50e7203e ("switch generic_file_splice_read() to use of ->read_iter()")
from the vfs-miklos tree and commits:
5b8a39c53a16 ("staging: lustre: llite: Replace write mutex with range lock")
ee5532436a7d ("staging: lustre: lov: remove LL_IOC_RECREATE_{FID, OBJ}")
from the staging tree.
I fixed it up (I think - 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/staging/lustre/lustre/llite/file.c
index d1d1efac1431,6e3a188baaae..000000000000
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@@ -1141,8 -1121,8 +1121,8 @@@ ll_file_io_generic(const struct lu_env
struct cl_io *io;
ssize_t result;
- CDEBUG(D_VFSTRACE, "file: %pD, type: %d ppos: %llu, count: %zd\n",
- CDEBUG(D_VFSTRACE, "file: %s, type: %d ppos: %llu, count: %zu\n",
- file->f_path.dentry->d_name.name, iot, *ppos, count);
++ CDEBUG(D_VFSTRACE, "file: %pD, type: %d ppos: %llu, count: %zu\n",
+ file, iot, *ppos, count);
restart:
io = vvp_env_thread_io(env);
@@@ -1150,26 -1130,59 +1130,45 @@@
if (cl_io_rw_init(env, io, iot, *ppos, count) == 0) {
struct vvp_io *vio = vvp_env_io(env);
- int write_mutex_locked = 0;
+ bool range_locked = false;
+
+ if (file->f_flags & O_APPEND)
+ range_lock_init(&range, 0, LUSTRE_EOF);
+ else
+ range_lock_init(&range, *ppos, *ppos + count - 1);
vio->vui_fd = LUSTRE_FPRIVATE(file);
- vio->vui_io_subtype = args->via_io_subtype;
+ vio->vui_iter = args->u.normal.via_iter;
+ vio->vui_iocb = args->u.normal.via_iocb;
- if ((iot == CIT_WRITE) &&
++ /*
++ * Direct IO reads must also take range lock,
++ * or multiple reads will try to work on the same pages
++ * See LU-6227 for details.
++ */
++ if (((iot == CIT_WRITE) ||
++ (iot == CIT_READ && (file->f_flags & O_DIRECT))) &&
+ !(vio->vui_fd->fd_flags & LL_FILE_GROUP_LOCKED)) {
- if (mutex_lock_interruptible(&lli->lli_write_mutex)) {
- result = -ERESTARTSYS;
++ CDEBUG(D_VFSTRACE, "Range lock [%llu, %llu]\n",
++ range.rl_node.in_extent.start,
++ range.rl_node.in_extent.end);
++ result = range_lock(&lli->lli_write_tree,
++ &range);
++ if (result < 0)
+ goto out;
- }
- write_mutex_locked = 1;
+
- switch (vio->vui_io_subtype) {
- case IO_NORMAL:
- vio->vui_iter = args->u.normal.via_iter;
- vio->vui_iocb = args->u.normal.via_iocb;
- /*
- * Direct IO reads must also take range lock,
- * or multiple reads will try to work on the same pages
- * See LU-6227 for details.
- */
- if (((iot == CIT_WRITE) ||
- (iot == CIT_READ && (file->f_flags & O_DIRECT))) &&
- !(vio->vui_fd->fd_flags & LL_FILE_GROUP_LOCKED)) {
- CDEBUG(D_VFSTRACE, "Range lock [%llu, %llu]\n",
- range.rl_node.in_extent.start,
- range.rl_node.in_extent.end);
- result = range_lock(&lli->lli_write_tree,
- &range);
- if (result < 0)
- goto out;
-
- range_locked = true;
- }
- down_read(&lli->lli_trunc_sem);
- break;
- case IO_SPLICE:
- vio->u.splice.vui_pipe = args->u.splice.via_pipe;
- vio->u.splice.vui_flags = args->u.splice.via_flags;
- break;
- default:
- CERROR("Unknown IO type - %u\n", vio->vui_io_subtype);
- LBUG();
++ range_locked = true;
}
+ down_read(&lli->lli_trunc_sem);
ll_cl_add(file, env, io);
result = cl_io_loop(env, io);
ll_cl_remove(file, env);
- if (args->via_io_subtype == IO_NORMAL)
- up_read(&lli->lli_trunc_sem);
+ up_read(&lli->lli_trunc_sem);
- if (write_mutex_locked)
- mutex_unlock(&lli->lli_write_mutex);
+ if (range_locked) {
+ CDEBUG(D_VFSTRACE, "Range unlock [%llu, %llu]\n",
+ range.rl_node.in_extent.start,
+ range.rl_node.in_extent.end);
+ range_unlock(&lli->lli_write_tree, &range);
+ }
} else {
/* cl_io_rw_init() handled IO */
result = io->ci_result;
@@@ -1256,88 -1269,31 +1255,6 @@@ static ssize_t ll_file_write_iter(struc
return result;
}
- static int ll_lov_recreate(struct inode *inode, struct ost_id *oi, u32 ost_idx)
- {
- struct obd_export *exp = ll_i2dtexp(inode);
- struct obd_trans_info oti = { 0 };
- struct obdo *oa = NULL;
- int lsm_size;
- int rc = 0;
- struct lov_stripe_md *lsm = NULL, *lsm2;
-
- oa = kmem_cache_zalloc(obdo_cachep, GFP_NOFS);
- if (!oa)
- return -ENOMEM;
-
- lsm = ccc_inode_lsm_get(inode);
- if (!lsm_has_objects(lsm)) {
- rc = -ENOENT;
- goto out;
- }
-
- lsm_size = sizeof(*lsm) + (sizeof(struct lov_oinfo) *
- (lsm->lsm_stripe_count));
-
- lsm2 = libcfs_kvzalloc(lsm_size, GFP_NOFS);
- if (!lsm2) {
- rc = -ENOMEM;
- goto out;
- }
-
- oa->o_oi = *oi;
- oa->o_nlink = ost_idx;
- oa->o_flags |= OBD_FL_RECREATE_OBJS;
- oa->o_valid = OBD_MD_FLID | OBD_MD_FLFLAGS | OBD_MD_FLGROUP;
- obdo_from_inode(oa, inode, OBD_MD_FLTYPE | OBD_MD_FLATIME |
- OBD_MD_FLMTIME | OBD_MD_FLCTIME);
- obdo_set_parent_fid(oa, &ll_i2info(inode)->lli_fid);
- memcpy(lsm2, lsm, lsm_size);
- ll_inode_size_lock(inode);
- rc = obd_create(NULL, exp, oa, &lsm2, &oti);
- ll_inode_size_unlock(inode);
-
- kvfree(lsm2);
- goto out;
- out:
- ccc_inode_lsm_put(inode, lsm);
- kmem_cache_free(obdo_cachep, oa);
- return rc;
- }
-
- static int ll_lov_recreate_obj(struct inode *inode, unsigned long arg)
- {
- struct ll_recreate_obj ucreat;
- struct ost_id oi;
-
- if (!capable(CFS_CAP_SYS_ADMIN))
- return -EPERM;
-
- if (copy_from_user(&ucreat, (struct ll_recreate_obj __user *)arg,
- sizeof(ucreat)))
- return -EFAULT;
-
- ostid_set_seq_mdt0(&oi);
- ostid_set_id(&oi, ucreat.lrc_id);
- return ll_lov_recreate(inode, &oi, ucreat.lrc_ost_idx);
- }
-
- static int ll_lov_recreate_fid(struct inode *inode, unsigned long arg)
-/*
- * Send file content (through pagecache) somewhere with helper
- */
-static ssize_t ll_file_splice_read(struct file *in_file, loff_t *ppos,
- struct pipe_inode_info *pipe, size_t count,
- unsigned int flags)
--{
- struct lu_fid fid;
- struct ost_id oi;
- u32 ost_idx;
- struct lu_env *env;
- struct vvp_io_args *args;
- ssize_t result;
- int refcheck;
--
- if (!capable(CFS_CAP_SYS_ADMIN))
- return -EPERM;
- env = cl_env_get(&refcheck);
- if (IS_ERR(env))
- return PTR_ERR(env);
--
- if (copy_from_user(&fid, (struct lu_fid __user *)arg, sizeof(fid)))
- return -EFAULT;
- args = ll_env_args(env, IO_SPLICE);
- args->u.splice.via_pipe = pipe;
- args->u.splice.via_flags = flags;
--
- fid_to_ostid(&fid, &oi);
- ost_idx = (fid_seq(&fid) >> 16) & 0xffff;
- return ll_lov_recreate(inode, &oi, ost_idx);
- result = ll_file_io_generic(env, args, in_file, CIT_READ, ppos, count);
- cl_env_put(env, &refcheck);
- return result;
--}
--
int ll_lov_setstripe_ea_info(struct inode *inode, struct dentry *dentry,
__u64 flags, struct lov_user_md *lum,
int lum_size)
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the vfs-miklos tree
From: Greg KH @ 2016-09-28 6:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Miklos Szeredi, linux-next, linux-kernel, Al Viro, Prakash Surya,
John L. Hammond
In-Reply-To: <20160928150022.7e87b6e3@canb.auug.org.au>
On Wed, Sep 28, 2016 at 03:00:22PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/lustre/lustre/llite/file.c
>
> between commit:
>
> 302d50e7203e ("switch generic_file_splice_read() to use of ->read_iter()")
>
> from the vfs-miklos tree and commits:
>
> 5b8a39c53a16 ("staging: lustre: llite: Replace write mutex with range lock")
> ee5532436a7d ("staging: lustre: lov: remove LL_IOC_RECREATE_{FID, OBJ}")
>
> from the staging tree.
>
> I fixed it up (I think - 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.
Looks good to me, one of these days we will get lustre out of staging to
make this easier...
thanks,
greg k-h
^ 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