* linux-next: manual merge of the target-bva tree with the target-updates tree
From: Stephen Rothwell @ 2017-06-01 4:10 UTC (permalink / raw)
To: Bart Van Assche, Nicholas A. Bellinger
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
Hi Bart,
Today's linux-next merge of the target-bva tree got a conflict in:
drivers/target/target_core_transport.c
between commit:
4ff83daa0200 ("target: Re-add check to reject control WRITEs with overflow data")
from the target-updates tree and commit:
2c66660df665 ("target: Fix overflow/underflow handling of commands with a Data-Out buffer")
from the target-bva tree.
I fixed it up (I think (guidance appreciated), 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/target/target_core_transport.c
index 6025935036c9,6cd49fe578a7..000000000000
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@@ -1164,37 -1164,7 +1164,21 @@@ target_cmd_size_check(struct se_cmd *cm
" %u does not match SCSI CDB Length: %u for SAM Opcode:"
" 0x%02x\n", cmd->se_tfo->get_fabric_name(),
cmd->data_length, size, cmd->t_task_cdb[0]);
+
+ if (cmd->data_direction == DMA_TO_DEVICE) {
- if (cmd->se_cmd_flags & SCF_SCSI_DATA_CDB) {
- pr_err_ratelimited("Rejecting underflow/overflow"
- " for WRITE data CDB\n");
- return TCM_INVALID_CDB_FIELD;
- }
+ /*
+ * Some fabric drivers like iscsi-target still expect to
+ * always reject overflow writes. Reject this case until
+ * full fabric driver level support for overflow writes
+ * is introduced tree-wide.
+ */
+ if (size > cmd->data_length) {
+ pr_err_ratelimited("Rejecting overflow for"
+ " WRITE control CDB\n");
+ return TCM_INVALID_CDB_FIELD;
+ }
+ }
/*
- * Reject READ_* or WRITE_* with overflow/underflow for
- * type SCF_SCSI_DATA_CDB.
- */
- if (dev->dev_attrib.block_size != 512) {
- pr_err("Failing OVERFLOW/UNDERFLOW for LBA op"
- " CDB on non 512-byte sector setup subsystem"
- " plugin: %s\n", dev->transport->name);
- /* Returns CHECK_CONDITION + INVALID_CDB_FIELD */
- return TCM_INVALID_CDB_FIELD;
- }
- /*
* For the overflow case keep the existing fabric provided
* ->data_length. Otherwise for the underflow case, reset
* ->data_length to the smaller SCSI expected data transfer
^ permalink raw reply
* Re: linux-next: manual merge of the target-bva tree with the target-updates tree
From: Nicholas A. Bellinger @ 2017-06-01 4:27 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Bart Van Assche, Linux-Next Mailing List,
Linux Kernel Mailing List
In-Reply-To: <20170601141055.3b64fefc@canb.auug.org.au>
On Thu, 2017-06-01 at 14:10 +1000, Stephen Rothwell wrote:
> Hi Bart,
>
> Today's linux-next merge of the target-bva tree got a conflict in:
>
> drivers/target/target_core_transport.c
>
> between commit:
>
> 4ff83daa0200 ("target: Re-add check to reject control WRITEs with overflow data")
>
> from the target-updates tree and commit:
>
> 2c66660df665 ("target: Fix overflow/underflow handling of commands with a Data-Out buffer")
>
> from the target-bva tree.
>
> I fixed it up (I think (guidance appreciated), 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.
>
Hi Bart,
The majority of this series hasn't been list reviewed, and shouldn't be
getting pushed in linux-next without some form of reviews.
I'll be getting back to v4.13 items now v4.12-rc fixes is out of the
way, but a weeks worth of list silence for your series doesn't mean
you're free to push un-reviewed stuff for drivers/target/ into
linux-next.
^ permalink raw reply
* Re: linux-next: manual merge of the target-bva tree with the target-updates tree
From: Bart Van Assche @ 2017-06-01 4:59 UTC (permalink / raw)
To: sfr@canb.auug.org.au, nab@linux-iscsi.org
Cc: linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
In-Reply-To: <20170601141055.3b64fefc@canb.auug.org.au>
On Thu, 2017-06-01 at 14:10 +1000, Stephen Rothwell wrote:
> Hi Bart,
>
> Today's linux-next merge of the target-bva tree got a conflict in:
>
> drivers/target/target_core_transport.c
>
> between commit:
>
> 4ff83daa0200 ("target: Re-add check to reject control WRITEs with overflow data")
>
> from the target-updates tree and commit:
>
> 2c66660df665 ("target: Fix overflow/underflow handling of commands with a Data-Out buffer")
>
> from the target-bva tree.
>
> I fixed it up (I think (guidance appreciated), 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.
Hello Stephen,
Thanks for having fixed this up. I hadn't noticed that Nic had queued up patches
that conflict with my patches. I will rebase my tree.
Bart.
^ permalink raw reply
* Re: linux-next: manual merge of the target-bva tree with the target-updates tree
From: Nicholas A. Bellinger @ 2017-06-01 5:04 UTC (permalink / raw)
To: Bart Van Assche
Cc: sfr@canb.auug.org.au, linux-kernel@vger.kernel.org,
linux-next@vger.kernel.org
In-Reply-To: <1496293179.16453.1.camel@sandisk.com>
On Thu, 2017-06-01 at 04:59 +0000, Bart Van Assche wrote:
> On Thu, 2017-06-01 at 14:10 +1000, Stephen Rothwell wrote:
> > Hi Bart,
> >
> > Today's linux-next merge of the target-bva tree got a conflict in:
> >
> > drivers/target/target_core_transport.c
> >
> > between commit:
> >
> > 4ff83daa0200 ("target: Re-add check to reject control WRITEs with overflow data")
> >
> > from the target-updates tree and commit:
> >
> > 2c66660df665 ("target: Fix overflow/underflow handling of commands with a Data-Out buffer")
> >
> > from the target-bva tree.
> >
> > I fixed it up (I think (guidance appreciated), 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.
>
> Hello Stephen,
>
> Thanks for having fixed this up. I hadn't noticed that Nic had queued up patches
> that conflict with my patches. I will rebase my tree.
>
Go ahead and get list review on drivers/target/ changes before pushing
them into linux-next, please.
Btw, I don't care if you queue up one's that do have at least two
Reviewed-bys into your tree, but everything that doesn't have
Reviewed-bys or Acked-by should not be going into linux-next.
^ permalink raw reply
* Re: linux-next: manual merge of the target-bva tree with the target-updates tree
From: Bart Van Assche @ 2017-06-01 5:05 UTC (permalink / raw)
To: sfr@canb.auug.org.au, nab@linux-iscsi.org
Cc: linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
In-Reply-To: <1496291234.27407.179.camel@haakon3.risingtidesystems.com>
On Wed, 2017-05-31 at 21:27 -0700, Nicholas A. Bellinger wrote:
> but a weeks worth of list silence for your series doesn't mean
> you're free to push un-reviewed stuff for drivers/target/ into
> linux-next.
I think this is an example of the pot calling the kettle black.
Your patch "target: Re-add check to reject control WRITEs with
overflow data" has not been reviewed by anyone but was pushed
into linux-next and sent to Linus anyway.
Bart.
^ permalink raw reply
* Re: linux-next: manual merge of the target-bva tree with the target-updates tree
From: Nicholas A. Bellinger @ 2017-06-01 5:15 UTC (permalink / raw)
To: Bart Van Assche
Cc: sfr@canb.auug.org.au, linux-kernel@vger.kernel.org,
linux-next@vger.kernel.org
In-Reply-To: <1496293517.16453.3.camel@sandisk.com>
On Thu, 2017-06-01 at 05:05 +0000, Bart Van Assche wrote:
> On Wed, 2017-05-31 at 21:27 -0700, Nicholas A. Bellinger wrote:
> > but a weeks worth of list silence for your series doesn't mean
> > you're free to push un-reviewed stuff for drivers/target/ into
> > linux-next.
>
> I think this is an example of the pot calling the kettle black.
> Your patch "target: Re-add check to reject control WRITEs with
> overflow data" has not been reviewed by anyone but was pushed
> into linux-next and sent to Linus anyway.
Heh, it fixed a regression you yourself pointed out. :)
If your going to report a bug and not review the patch to address the
regression, I'm not going to let that regression slide to restore
existing behavior, just because you didn't bother to review the patch in
three plus weeks for the bug you reported.
Anyways, I'll get to your patches, but please get reviews on the list by
sending series that people want to review, instead of large unwieldy
series that intermix new features and random bug-fixes without any
context.
No wonder why people don't send time reviewing them!
^ permalink raw reply
* linux-next: Tree for Jun 1
From: Stephen Rothwell @ 2017-06-01 5:39 UTC (permalink / raw)
To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List
Hi all,
Changes since 20170531:
The net-next tree gained a conflict against the net tree.
The mfd tree still had its build failure so I used the version from
next-20170530.
The drivers-x86 tree lost its build failure.
The target-bva tree gained a conflict against the target-updates tree.
The rtc tree lost its build failure.
Non-merge commits (relative to Linus' tree): 3539
3755 files changed, 144612 insertions(+), 78142 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 263 trees (counting Linus' and 41 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (d602fb684494 Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs)
Merging fixes/master (97da3854c526 Linux 4.11-rc3)
Merging kbuild-current/fixes (05d8cba4a1e8 kbuild: skip install/check of headers right under uapi directories)
Merging arc-current/for-curr (a4da5b17736d arc: Set IO-coherency aperture base to LINUX_LINK_BASE)
Merging arm-current/fixes (9861991321ec ARM: 8677/1: boot/compressed: fix decompressor header layout for v7-M)
Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (a4700a261072 powerpc: Add PPC_FEATURE userspace bits for SCV and DARN instructions)
Merging sparc/master (7485af89a6fd arch/sparc: increase CONFIG_NODES_SHIFT on SPARC64 to 5)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (c2e8471d98f0 mpls: fix clearing of dead nh_flags on link up)
Merging ipsec/master (a486cd23661c xfrm: fix state migration copy replay sequence numbers)
Merging netfilter/master (468b0df61a51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections)
Merging wireless-drivers/master (6d18c732b95c bridge: start hello_timer when enabling KERNEL_STP in br_stp_start)
Merging mac80211/master (7a7c0a6438b8 mac80211: fix TX aggregation start/stop callback race)
Merging sound-current/for-linus (e49a14fa36ae ALSA: usb: Avoid VLA in mixer_us16x08.c)
Merging pci-current/for-linus (bd2df9b1e094 PCI: Make error code types consistent in pci_{read,write}_config_*)
Merging driver-core.current/driver-core-linus (08332893e37a Linux 4.12-rc2)
Merging tty.current/tty-linus (5ed02dbb4974 Linux 4.12-rc3)
Merging usb.current/usb-linus (b3addcf0d1f0 usb: musb: dsps: keep VBUS on for host-only mode)
Merging usb-gadget-fixes/fixes (a351e9b9fc24 Linux 4.11)
Merging usb-serial-fixes/usb-linus (5ed02dbb4974 Linux 4.12-rc3)
Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show)
Merging phy/fixes (a380b78b799b phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer)
Merging staging.current/staging-linus (3d51b9562673 staging: ccree: add CRYPTO dependency)
Merging char-misc.current/char-misc-linus (cdc1daca1b9b MAINTAINERS: Change maintainer of genwqe driver)
Merging input-current/for-linus (2fef826e45c6 Input: synaptics - tell users to report when they should be using rmi-smbus)
Merging crypto-current/master (f3ad587070d6 crypto: gcm - wait for crypto op not signal safe)
Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination)
Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6)
Merging kselftest-fixes/fixes (2ea659a9ef48 Linux 4.12-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 nand-fixes/nand/fixes (d4ed3b9015b5 mtd: nand: make nand_ooblayout_lp_hamming_ops static)
Merging spi-nor-fixes/spi-nor/fixes (2ea659a9ef48 Linux 4.12-rc1)
Merging mfd-fixes/for-mfd-fixes (b2376407f989 mfd: cros-ec: Fix host command buffer size)
Merging v4l-dvb-fixes/fixes (dd8245f445f5 [media] atomisp: don't treat warnings as errors)
Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded)
Merging drm-intel-fixes/for-linux-next-fixes (9bd9590997b9 drm/i915: Stop pretending to mask/unmask LPE audio interrupts)
Merging drm-misc-fixes/for-linux-next-fixes (869e188a35c9 drm: Fix locking in drm_atomic_helper_resume)
Merging kbuild/for-next (547b9255cde5 Merge branch 'fixes' into for-next)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging arm/for-next (e8fa27d7428e Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (2ea659a9ef48 Linux 4.12-rc1)
Merging arm-soc/for-next (a8854d66fe2c arm-soc: document merges)
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
Merging amlogic/for-next (69f33fe16f5d Merge branch 'v4.13/defconfig' into tmp/aml-rebuild)
Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next)
Merging at91/at91-next (7d9fb74454a7 Merge branch 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (c156bb73ae01 Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (428c917deaaf Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (b45371147f9d Merge branch 'for_4.13/keystone_dts' into next)
Merging mvebu/for-next (e629b4b1c763 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (78f9b622f8a9 Merge branch 'omap-for-v4.13/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging reset/reset/next (2acb037fc42b reset: Add a Gemini reset controller)
Merging qcom/for-next (bca31d5e9dcb Merge branch 'arm64-for-4.13' into all-for-4.13)
Merging realtek/realtek/for-next (af5f7bdb3c04 Merge branch 'realtek/v4.12/dt64' into next)
Merging renesas/next (bfcadd8730e0 Merge branches 'arm64-dt-for-v4.13' and 'dt-for-v4.13' into next)
Merging rockchip/for-next (7de9be9b8bfa Merge branch 'v4.13-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging samsung-krzk/for-next (1d3086334f59 Merge branch 'next/soc' into for-next)
Merging sunxi/sunxi/for-next (fa13b83964f0 Merge branches 'sunxi/dt-for-4.13' and 'sunxi/clk-for-4.13' into sunxi/for-next)
Merging tegra/for-next (29d04525797f Merge branch for-4.12/clk into for-next)
Merging arm64/for-next/core (db46a72b9713 ARM64/PCI: Set root bus NUMA node on ACPI systems)
Merging clk/clk-next (658a7568030e Merge tag 'meson-clk-fixes-for-4.12-rc2' of git://github.com/baylibre/clk-meson into clk-fixes)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (1072734a2c63 m68k/defconfig: Update defconfigs for v4.12-rc1)
Merging m68knommu/for-next (5ed02dbb4974 Linux 4.12-rc3)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
Merging microblaze/next (83f0124ad81e microblaze: remove asm-generic wrapper headers)
Merging mips/mips-for-linux-next (bc53f9c58065 Merge branch '4.12-fixes' into mips-for-linux-next)
Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation)
Merging openrisc/for-next (8d797f3169d1 openrisc: explicitly include linux/bug.h in asm/fixmap.h)
Merging parisc-hd/for-next (5aa2aabff1ce parisc: Stop CPUs via PAT firmware before system halt or reboot.)
Merging powerpc/next (83a092cf95f2 powerpc: Link warning for orphan sections)
Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (5a4356351194 s390/facilities: remove stfle requirement)
Merging sparc-next/master (60925ee97e2b Merge branch 'sparc64-queued-locks')
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory)
Merging uml/linux-next (ce4586063f1a um: Add missing NR_CPUS include)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6fad04b7585d Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (6f9d696f016f fscrypt: correct collision claim for digested names)
Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (4a44f70d220c Merge branch 'for-next-next-v4.13-20170531' into for-next-20170531)
Merging ceph/master (6ac56951dc10 rbd: implement REQ_OP_WRITE_ZEROES)
Merging cifs/for-next (a95cfad947d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (d8747d642ec4 reiserfs: Make flush bios explicitely sync)
Merging ext4/dev (67a7d5f561f4 ext4: fix fdatasync(2) after extent manipulation operations)
Merging f2fs/dev (2d3e4866dea9 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (0b6e9ea041e6 fuse: Add support for pid namespaces)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (6ea44adce915 SUNRPC: ensure correct error is reported by xs_tcp_setup_socket())
Merging nfsd/nfsd-next (b26b78cb7260 nfsd: Fix up the "supattr_exclcreat" attributes)
Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
Merging overlayfs/overlayfs-next (a082c6f680da ovl: filter trusted xattr for non-admin)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (7bccd12d27b7 ubi: Add debugfs file for tracking PEB state)
Merging xfs/for-next (161f55efba5d xfs: fix use-after-free in xfs_finish_page_writeback)
Merging file-locks/linux-next (a928a6b45282 fs/locks: don't mess with the address limit in compat_fcntl64)
Merging vfs/for-next (919bb328b020 Merge branch 'work.misc' into for-next)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (719f6a7040f1 printk: Use the main logbuf in NMI when logbuf_lock is available)
Merging pci/next (c823e5b95885 Merge branch 'pci/host-xilinx' into next)
Merging pstore/for-next/pstore (d3762358a739 pstore: Fix format string to use %u for record id)
Merging hid/for-next (698be82b960a Merge branch 'for-4.13/ish' into for-next)
Merging i2c/i2c/for-next (61e3d0f79d6e i2c: reformat core-base file header)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (b3398adc0da6 firmware: dmi_scan: Look for SMBIOS 3 entry point first)
Merging hwmon-staging/hwmon-next (9a7967c91695 hwmon: (ibmpowernv) Add highest/lowest attributes to sensors)
Merging jc_docs/docs-next (6312811be26f Merge remote-tracking branch 'mauro-exp/docbook3' into death-to-docbook)
Merging v4l-dvb/master (36bcba973ad4 [media] mtk_vcodec_dec: return error at mtk_vdec_pic_info_update())
Merging v4l-dvb-next/master (791a9a666d1a Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging fbdev/fbdev-for-next (34bf129a7f06 fbdev: sti: don't select CONFIG_VT)
Merging pm/linux-next (0ab35512dd7c Merge branch 'pm-cpufreq' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (cb15c81a0c1c Merge branch 'thermal-soc' into next)
Merging thermal-soc/next (33011c583fcc Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (591c3beb86c4 dlm: Delete an unnecessary variable initialisation in dlm_ls_start())
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (551f40c42f02 Merge branch 'dsa-add-Microchip-KSZ9477-DSA-driver')
CONFLICT (content): Merge conflict in drivers/net/phy/marvell.c
Merging ipsec-next/master (d49c9dc1c848 ipv6: remove unused variables in esp6)
Merging netfilter-next/master (34158151d2aa netfilter: cttimeout: use nf_ct_iterate_cleanup_net to unlink timeout objs)
Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period)
Merging wireless-drivers-next/master (98f44cb0655c qtnfmac: introduce new FullMAC driver for Quantenna chipsets)
Merging bluetooth/master (a3995460491d net: phy: Relax error checking on sysfs_create_link())
Merging mac80211-next/master (5d473fedd17a mac80211: Invoke TX LED in more code paths)
Merging rdma/for-next (67cf3623e097 rxe: expose num_possible_cpus() cnum_comp_vectors)
Merging gfs2/for-next (3ef2bc099d1c Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux)
Merging mtd/master (2ea659a9ef48 Linux 4.12-rc1)
Merging l2-mtd/master (c316cf670491 Merge 'v4.12-rc1' into MTD)
Merging nand/nand/next (1f7f495afeae mtd: nand: mediatek: add support for MT2712 NAND FLASH Controller)
Merging spi-nor/spi-nor/next (05d090f00203 mtd: spi-nor: Potential oops on error path in quad_enable())
Merging crypto/master (6507c57bb013 crypto: ccp - Use IPAD/OPAD constant)
Merging drm/drm-next (2a1720376add Backmerge tag 'v4.12-rc3' into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_shrinker.c
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (adfdf85d795f drm/i915: Prevent the system suspend complete optimization)
Merging drm-tegra/drm/tegra/for-next (b0d36daa0ab5 gpu: host1x: Fix host1x driver shutdown)
Merging drm-misc/for-linux-next (9a8d5e4a53dc drm/vc4: Fix comment in vc4_drv.h)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (98db803f6413 msm/drm: gpu: Dynamically locate the clocks from the device tree)
Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address)
Merging mali-dp/for-upstream/mali-dp (763656d30b3d drm: mali-dp: use div_u64 for expensive 64-bit divisions)
Merging sunxi-drm/sunxi-drm/for-next (a7047675206a drm/sun4i: Add compatible for the A10s pipeline)
Merging imx-drm/imx-drm/next (b8f0951de854 gpu: ipu-v3: prg: remove counter load enable)
Merging etnaviv/etnaviv/next (d79fd1ccf2cd drm/etnaviv: implement cooling support for new GPU cores)
Merging kspp/for-next/kspp (4b49d6a66b06 Merge branch 'for-next/gcc-plugin/randstruct' into for-next/kspp)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (7421a1671abe ALSA: pcm: include pcm_local.h and remove some extraneous tabs)
Merging sound-asoc/for-next (aed323d42578 Merge remote-tracking branches 'asoc/topic/stm32', 'asoc/topic/sunxi', 'asoc/topic/tlv320dac31xx' and 'asoc/topic/wm-adsp' into asoc-next)
Merging modules/modules-next (3e2e857f9c3a module: Add module name to modinfo)
Merging input/next (32a62b9441d8 Input: synaptics-rmi4 - change a char type to u8)
Merging block/for-next (9c2c43e3c155 Merge branch 'for-4.13/block' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (d8fc98f845c9 dm kcopyd: add sequential write feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (6e75316c15df mmc: tmio: make sure SDIO gets reinitialized after resume)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (5a8948f8a32b md: Make flush bios explicitely sync)
Merging mfd/for-mfd-next (60194d283dcf mfd: intel_quark_i2c_gpio: Add support for SIMATIC IOT2000 platform)
$ git reset --hard HEAD^
Merging next-20170530 version of mfd
Merging backlight/for-backlight-next (e739c5bb20be backlight: Add support for Arctic Sand LED backlight driver chips)
Merging battery/for-next (b5910897b2ee power_supply: Add Apple Brick ID power supply type)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (af7a73de20f9 Merge remote-tracking branches 'regulator/topic/settle' and 'regulator/topic/tps65917' into regulator-next)
Merging security/next (d68c51e0b377 Sync to mainline for security submaintainers to work against)
Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.)
Merging keys/keys-next (e36484b5ac31 crypto : asymmetric_keys : verify_pefile:zero memory content before freeing)
Merging selinux/next (409dcf31538a selinux: Add a cache for quicker retreival of PKey SIDs)
Merging tpmdd/next (f175275bfd53 tpm, tpmrm: Mark tpmrm_write as static)
Merging watchdog/master (08332893e37a Linux 4.12-rc2)
Merging iommu/next (752b80575ea4 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/core', 'x86/vt-d' and 'x86/amd' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (7cb671e7a34d vfio/type1: Reduce repetitive calls in vfio_pin_pages_remote())
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
Merging audit/next (7786f6b6dfc1 audit: add ambient capabilities to CAPSET and BPRM_FCAPS records)
Merging devicetree/for-next (08cd94ec522b dt-bindings: net: move FMan binding)
Merging mailbox/mailbox-for-next (cb710ab1d8a2 mailbox: handle empty message in tx_tick)
Merging spi/for-next (b8076f1a1d44 Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave', 'spi/topic/spidev' and 'spi/topic/st-ssc4' into spi-next)
Merging tip/auto-latest (8e3c0499d0c9 Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (6f9c89000c3f Merge tag 'arch-timer-errata' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into clockevents/4.12)
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (7d2fdaa694c5 EDAC, mv64x60: Check driver registration success)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (6ee98ffeea0b x86/ftrace: Make sure that ftrace trampolines are not RWX)
Merging rcu/rcu/next (d90401eb7855 srcu: Move rcu_scheduler_starting() from Tiny RCU to Tiny SRCU)
Merging kvm/linux-next (08332893e37a Linux 4.12-rc2)
Merging kvm-arm/next (a2b19e6e2d4b KVM: arm/arm64: vgic-its: Cleanup after failed ITT restore)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (76d837a4c0f9 KVM: PPC: Book3S PR: Don't include SPAPR TCE code on non-pseries platforms)
Merging kvms390/next (a2bdbb2c7e70 KVM: s390: ioctls to get and set guest storage attributes)
Merging xen-tip/linux-next (c71e6d804c88 xen: make xen_flush_tlb_all() static)
Merging percpu/for-next (1328710b8ec3 mark most percpu globals as __ro_after_init)
Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next)
Merging drivers-x86/for-next (6bee1af9dcaa platform/x86: intel_pmc_ipc: Mark ipc_data_readb() as __maybe_unused)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (3026050179a3 HSI: ssi_protocol: double free in ssip_pn_xmit())
Merging leds/for-next (71c17b06ef7d leds: trigger: gpio: Use threaded IRQ)
Merging ipmi/for-next (bf10ff69dd6e ipmi_ssif: remove redundant null check on array client->adapter->name)
Merging driver-core/driver-core-next (e622ec579b9a doc: update kernel version in sysfs-uevent ABI doc)
Merging usb/usb-next (7f7c3cde613d uwb: i1480: add missing goto)
Merging usb-gadget/next (2868b2513aa7 Merge tag 'linux-kselftest-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest)
Merging usb-serial/usb-next (5ed02dbb4974 Linux 4.12-rc3)
Merging usb-chipidea-next/ci-for-usb-next (c4a0bbbdb7f6 usb: chipidea: properly handle host or gadget initialization failure)
Merging phy-next/next (2ea659a9ef48 Linux 4.12-rc1)
Merging tty/tty-next (aa668632ae8c Merge 4.12-rc3 into tty-next)
Merging char-misc/char-misc-next (46505c802a55 Revert "firmware: vpd: remove platform driver")
Merging extcon/extcon-next (a781a7d646ad extcon: qcom-spmi-misc: add dependency on ARCH_QCOM)
Merging staging/staging-next (ca9280d1f82a Merge tag 'iio-for-4.13a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
Merging mux/for-next (a351e9b9fc24 Linux 4.11)
Merging slave-dma/next (2f12f9eac2ae Merge branch 'topic/pl330' into next)
Merging cgroup/for-next (41c25707d217 cpuset: consider dying css as offline)
Merging scsi/for-next (35f07119477d Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (52f866197057 scsi: lpfc: fix spelling mistake "entrys" -> "entries")
Merging target-updates/for-next (cae4e246117d ibmvscsis: Enable Logical Partition Migration Support)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (97e89d864bc8 tcm_qla2xxx: Simplify the code for handling aborted commands)
CONFLICT (content): Merge conflict in drivers/target/target_core_transport.c
Merging libata/for-next (d1020a116c4a Merge branch 'for-4.12-fixes' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (c8b0d7290657 s390/virtio: change maintainership)
Merging rpmsg/for-next (0696d197bda1 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (7043bc081bd1 Merge branch 'devel' into for-next)
Merging pinctrl/for-next (62edf480d86a Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging pinctrl-samsung/for-next (eb1c179c966a pinctrl: samsung: Explicitly cast pointer returned by of_iomap() to iomem)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (97512ceafaac Merge branch 'for-4.12/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 (296990deb389 mnt: Make propagate_umount less slow for overlapping mount propagation trees)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (9dfa7bba35ac fix race in drivers/char/random.c:get_reg())
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (2ea659a9ef48 Linux 4.12-rc1)
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (c87a040fb6c5 Merge branch 'for-4.12/upstream-fixes' into for-next)
Merging coresight/next (44389a7d12ec coresight: add support for CPU debug module)
Merging rtc/rtc-next (a21512c1698d rtc.txt: standardize document format)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (f5705aa8cfed dax, xfs, ext4: compile out iomap-dax paths in the FS_DAX=n case)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
Merging akpm-current/current (d25f0d9c6100 ipc/util.h: update documentation for ipc_getref() and ipc_putref())
$ git checkout -b akpm remotes/origin/akpm/master
Applying: sparc64: NG4 memset 32 bits overflow
Applying: xtensa: use generic fb.h
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
Merging akpm/master (3fda3dcb7fb3 lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
^ permalink raw reply
* Re: linux-next: Tree for May 31
From: Michael Ellerman @ 2017-06-01 6:07 UTC (permalink / raw)
To: Stephen Rothwell, Linux-Next Mailing List
Cc: Linux Kernel Mailing List, PowerPC
In-Reply-To: <20170531153227.7098f0a1@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Changes since 20170530:
>
> The mfd tree gained a build failure so I used the version from
> next-20170530.
>
> The drivers-x86 tree gained the same build failure as the mfd tree so
> I used the version from next-20170530.
>
> The rtc tree gained a build failure so I used the version from
> next-20170530.
>
> The akpm tree lost a patch that turned up elsewhere.
>
> Non-merge commits (relative to Linus' tree): 3325
> 3598 files changed, 135000 insertions(+), 72065 deletions(-)
More or less all my powerpc boxes failed to boot this.
All the stack traces point to new_slab():
PID hash table entries: 4096 (order: -1, 32768 bytes)
Memory: 127012480K/134217728K available (12032K kernel code, 1920K rwdata, 2916K rodata, 1088K init, 14065K bss, 487808K reserved, 6717440K cma-reserved)
Unable to handle kernel paging request for data at address 0x000004f0
Faulting instruction address: 0xc00000000033fd48
Oops: Kernel access of bad area, sig: 11 [#1]
SMP NR_CPUS=2048
NUMA
PowerNV
Modules linked in:
CPU: 0 PID: 0 Comm: swapper Not tainted 4.12.0-rc3-gccN-next-20170531-gf2882f4 #1
task: c000000000fb1200 task.stack: c000000001104000
NIP: c00000000033fd48 LR: c00000000033fb1c CTR: c0000000002d6ae0
REGS: c000000001107970 TRAP: 0380 Not tainted (4.12.0-rc3-gccN-next-20170531-gf2882f4)
MSR: 9000000002001033 <SF,HV,VEC,ME,IR,DR,RI,LE>
CR: 22042244 XER: 00000000
CFAR: c00000000033fbfc SOFTE: 0
GPR00: c00000000033fb1c c000000001107bf0 c000000001108b00 c0000007ffff6180
GPR04: c000000001139600 0000000000000000 00000007f9880000 0000000000000080
GPR08: c0000000011cf5d8 00000000000004f0 0000000000000000 c0000007ffff6280
GPR12: 0000000028042822 c00000000fd40000 0000000000000000 0000000000000000
GPR16: 0000000000000000 c000000000dc9198 c000000000dc91c8 000000000000006f
GPR20: 0000000000000001 0000000000002000 00000000014000c0 0000000000000000
GPR24: 0000000000000201 c0000007f9010000 0000000000000000 0000000080010400
GPR28: 0000000000000001 0000000000000006 f000000001fe4000 c000000000f15958
NIP [c00000000033fd48] new_slab+0x318/0x710
LR [c00000000033fb1c] new_slab+0xec/0x710
Call Trace:
[c000000001107bf0] [c00000000033fb1c] new_slab+0xec/0x710 (unreliable)
[c000000001107cc0] [c000000000348cc0] __kmem_cache_create+0x270/0x800
[c000000001107df0] [c000000000ece8b4] create_boot_cache+0xa0/0xe4
[c000000001107e70] [c000000000ed30d0] kmem_cache_init+0x68/0x16c
[c000000001107f00] [c000000000ea0b08] start_kernel+0x2a0/0x554
[c000000001107f90] [c00000000000ad70] start_here_common+0x1c/0x4ac
Instruction dump:
57bd039c 79291f24 7fbd0074 7c68482a 7bbdd182 3bbd0005 60000000 3d230001
e95e0038 e9299a7a 3929009e 79291f24 <7f6a482a> e93b0080 7fa34800 409e036c
---[ end trace 0000000000000000 ]---
Kernel panic - not syncing: Attempted to kill the idle task!
Rebooting in 10 seconds..
cheers
^ permalink raw reply
* Re: linux-next: Tree for May 31
From: Stephen Rothwell @ 2017-06-01 6:13 UTC (permalink / raw)
To: Michael Ellerman
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, PowerPC,
Andrew Morton
In-Reply-To: <8737bk44w8.fsf@concordia.ellerman.id.au>
Hi Michael,
On Thu, 01 Jun 2017 16:07:51 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
> > Changes since 20170530:
> >
> > Non-merge commits (relative to Linus' tree): 3325
> > 3598 files changed, 135000 insertions(+), 72065 deletions(-)
>
> More or less all my powerpc boxes failed to boot this.
Good timing :-) How about the linux-next I just released. It has had
a few of the mm changes removed since yesterday.
> All the stack traces point to new_slab():
>
> PID hash table entries: 4096 (order: -1, 32768 bytes)
> Memory: 127012480K/134217728K available (12032K kernel code, 1920K rwdata, 2916K rodata, 1088K init, 14065K bss, 487808K reserved, 6717440K cma-reserved)
> Unable to handle kernel paging request for data at address 0x000004f0
> Faulting instruction address: 0xc00000000033fd48
> Oops: Kernel access of bad area, sig: 11 [#1]
> SMP NR_CPUS=2048
> NUMA
> PowerNV
> Modules linked in:
> CPU: 0 PID: 0 Comm: swapper Not tainted 4.12.0-rc3-gccN-next-20170531-gf2882f4 #1
> task: c000000000fb1200 task.stack: c000000001104000
> NIP: c00000000033fd48 LR: c00000000033fb1c CTR: c0000000002d6ae0
> REGS: c000000001107970 TRAP: 0380 Not tainted (4.12.0-rc3-gccN-next-20170531-gf2882f4)
> MSR: 9000000002001033 <SF,HV,VEC,ME,IR,DR,RI,LE>
> CR: 22042244 XER: 00000000
> CFAR: c00000000033fbfc SOFTE: 0
> GPR00: c00000000033fb1c c000000001107bf0 c000000001108b00 c0000007ffff6180
> GPR04: c000000001139600 0000000000000000 00000007f9880000 0000000000000080
> GPR08: c0000000011cf5d8 00000000000004f0 0000000000000000 c0000007ffff6280
> GPR12: 0000000028042822 c00000000fd40000 0000000000000000 0000000000000000
> GPR16: 0000000000000000 c000000000dc9198 c000000000dc91c8 000000000000006f
> GPR20: 0000000000000001 0000000000002000 00000000014000c0 0000000000000000
> GPR24: 0000000000000201 c0000007f9010000 0000000000000000 0000000080010400
> GPR28: 0000000000000001 0000000000000006 f000000001fe4000 c000000000f15958
> NIP [c00000000033fd48] new_slab+0x318/0x710
> LR [c00000000033fb1c] new_slab+0xec/0x710
> Call Trace:
> [c000000001107bf0] [c00000000033fb1c] new_slab+0xec/0x710 (unreliable)
> [c000000001107cc0] [c000000000348cc0] __kmem_cache_create+0x270/0x800
> [c000000001107df0] [c000000000ece8b4] create_boot_cache+0xa0/0xe4
> [c000000001107e70] [c000000000ed30d0] kmem_cache_init+0x68/0x16c
> [c000000001107f00] [c000000000ea0b08] start_kernel+0x2a0/0x554
> [c000000001107f90] [c00000000000ad70] start_here_common+0x1c/0x4ac
> Instruction dump:
> 57bd039c 79291f24 7fbd0074 7c68482a 7bbdd182 3bbd0005 60000000 3d230001
> e95e0038 e9299a7a 3929009e 79291f24 <7f6a482a> e93b0080 7fa34800 409e036c
> ---[ end trace 0000000000000000 ]---
>
> Kernel panic - not syncing: Attempted to kill the idle task!
> Rebooting in 10 seconds..
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: Tree for May 31
From: Michael Ellerman @ 2017-06-01 7:02 UTC (permalink / raw)
To: Stephen Rothwell, Linux-Next Mailing List
Cc: PowerPC, Linux Kernel Mailing List
In-Reply-To: <8737bk44w8.fsf@concordia.ellerman.id.au>
Michael Ellerman <mpe@ellerman.id.au> writes:
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
>> Hi all,
>>
>> Changes since 20170530:
>>
>> The mfd tree gained a build failure so I used the version from
>> next-20170530.
>>
>> The drivers-x86 tree gained the same build failure as the mfd tree so
>> I used the version from next-20170530.
>>
>> The rtc tree gained a build failure so I used the version from
>> next-20170530.
>>
>> The akpm tree lost a patch that turned up elsewhere.
>>
>> Non-merge commits (relative to Linus' tree): 3325
>> 3598 files changed, 135000 insertions(+), 72065 deletions(-)
>
> More or less all my powerpc boxes failed to boot this.
>
> All the stack traces point to new_slab():
>
> PID hash table entries: 4096 (order: -1, 32768 bytes)
> Memory: 127012480K/134217728K available (12032K kernel code, 1920K rwdata, 2916K rodata, 1088K init, 14065K bss, 487808K reserved, 6717440K cma-reserved)
> Unable to handle kernel paging request for data at address 0x000004f0
> Faulting instruction address: 0xc00000000033fd48
> Oops: Kernel access of bad area, sig: 11 [#1]
> SMP NR_CPUS=2048
> NUMA
> PowerNV
> Modules linked in:
> CPU: 0 PID: 0 Comm: swapper Not tainted 4.12.0-rc3-gccN-next-20170531-gf2882f4 #1
> task: c000000000fb1200 task.stack: c000000001104000
> NIP: c00000000033fd48 LR: c00000000033fb1c CTR: c0000000002d6ae0
> REGS: c000000001107970 TRAP: 0380 Not tainted (4.12.0-rc3-gccN-next-20170531-gf2882f4)
> MSR: 9000000002001033 <SF,HV,VEC,ME,IR,DR,RI,LE>
> CR: 22042244 XER: 00000000
> CFAR: c00000000033fbfc SOFTE: 0
> GPR00: c00000000033fb1c c000000001107bf0 c000000001108b00 c0000007ffff6180
> GPR04: c000000001139600 0000000000000000 00000007f9880000 0000000000000080
> GPR08: c0000000011cf5d8 00000000000004f0 0000000000000000 c0000007ffff6280
> GPR12: 0000000028042822 c00000000fd40000 0000000000000000 0000000000000000
> GPR16: 0000000000000000 c000000000dc9198 c000000000dc91c8 000000000000006f
> GPR20: 0000000000000001 0000000000002000 00000000014000c0 0000000000000000
> GPR24: 0000000000000201 c0000007f9010000 0000000000000000 0000000080010400
> GPR28: 0000000000000001 0000000000000006 f000000001fe4000 c000000000f15958
> NIP [c00000000033fd48] new_slab+0x318/0x710
> LR [c00000000033fb1c] new_slab+0xec/0x710
> Call Trace:
> [c000000001107bf0] [c00000000033fb1c] new_slab+0xec/0x710 (unreliable)
> [c000000001107cc0] [c000000000348cc0] __kmem_cache_create+0x270/0x800
> [c000000001107df0] [c000000000ece8b4] create_boot_cache+0xa0/0xe4
> [c000000001107e70] [c000000000ed30d0] kmem_cache_init+0x68/0x16c
> [c000000001107f00] [c000000000ea0b08] start_kernel+0x2a0/0x554
> [c000000001107f90] [c00000000000ad70] start_here_common+0x1c/0x4ac
> Instruction dump:
> 57bd039c 79291f24 7fbd0074 7c68482a 7bbdd182 3bbd0005 60000000 3d230001
> e95e0038 e9299a7a 3929009e 79291f24 <7f6a482a> e93b0080 7fa34800 409e036c
> ---[ end trace 0000000000000000 ]---
>
> Kernel panic - not syncing: Attempted to kill the idle task!
> Rebooting in 10 seconds..
Bisect says:
commit b6bc6724488ac9a149f4ee50d9f036b0fe2420c5
Author: Johannes Weiner <hannes@cmpxchg.org>
Date: Wed May 31 09:17:23 2017 +1000
mm: vmstat: move slab statistics from zone to node counters
Patch series "mm: per-lruvec slab stats"
Josef is working on a new approach to balancing slab caches and the page
cache. For this to work, he needs slab cache statistics on the lruvec
level. These patches implement that by adding infrastructure that allows
updating and reading generic VM stat items per lruvec, then switches some
existing VM accounting sites, including the slab accounting ones, to this
new cgroup-aware API.
I'll follow up with more patches on this, because there is actually
substantial simplification that can be done to the memory controller when
we replace private memcg accounting with making the existing VM accounting
sites cgroup-aware. But this is enough for Josef to base his slab reclaim
work on, so here goes.
This patch (of 5):
To re-implement slab cache vs. page cache balancing, we'll need the slab
counters at the lruvec level, which, ever since lru reclaim was moved from
the zone to the node, is the intersection of the node, not the zone, and
the memcg.
We could retain the per-zone counters for when the page allocator dumps
its memory information on failures, and have counters on both levels -
which on all but NUMA node 0 is usually redundant. But let's keep it
simple for now and just move them. If anybody complains we can restore
the per-zone counters.
Link: http://lkml.kernel.org/r/20170530181724.27197-3-hannes@cmpxchg.org
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/base/node.c | 10 +++++-----
include/linux/mmzone.h | 4 ++--
mm/page_alloc.c | 4 ----
mm/slab.c | 8 ++++----
mm/slub.c | 4 ++--
mm/vmscan.c | 2 +-
mm/vmstat.c | 4 ++--
7 files changed, 16 insertions(+), 20 deletions(-)
cheers
^ permalink raw reply
* Re: linux-next: Tree for May 31
From: Michael Ellerman @ 2017-06-01 7:03 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, PowerPC,
Andrew Morton
In-Reply-To: <20170601161315.6ec8e08e@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Michael,
>
> On Thu, 01 Jun 2017 16:07:51 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote:
>>
>> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>>
>> > Changes since 20170530:
>> >
>> > Non-merge commits (relative to Linus' tree): 3325
>> > 3598 files changed, 135000 insertions(+), 72065 deletions(-)
>>
>> More or less all my powerpc boxes failed to boot this.
>
> Good timing :-) How about the linux-next I just released. It has had
> a few of the mm changes removed since yesterday.
Yep, the offending patch seems to have been dropped.
cheers
^ permalink raw reply
* next-20170601 build: 0 failures 0 warnings (next-20170601)
From: Build bot for Mark Brown @ 2017-06-01 12:14 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170601
Git describe: next-20170601
Commit: 3ab334ebe8 Add linux-next specific files for 20170601
Build Time: 183 min 50 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 0
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
-------------------------------------------------------------------------------
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm64-allmodconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allmodconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: linux-next: manual merge of the target-bva tree with the target-updates tree
From: Bart Van Assche @ 2017-06-01 21:14 UTC (permalink / raw)
To: Nicholas A. Bellinger
Cc: sfr@canb.auug.org.au, linux-kernel@vger.kernel.org,
linux-next@vger.kernel.org
In-Reply-To: <1496293444.27407.184.camel@haakon3.risingtidesystems.com>
On 05/31/17 22:04, Nicholas A. Bellinger wrote:
> Go ahead and get list review on drivers/target/ changes before pushing
> them into linux-next, please.
>
> Btw, I don't care if you queue up one's that do have at least two
> Reviewed-bys into your tree, but everything that doesn't have
> Reviewed-bys or Acked-by should not be going into linux-next.
It is not your job to rewrite the rules for linux-next. I'm following
the guidelines I received from Stephen in December 2016. You were copied
on the e-mail with guidelines Stephen sent to me. See also
https://www.spinics.net/lists/linux-next/msg38488.html.
Stephen, if anything would have changed in the meantime that I'm not
aware of please let me know.
Bart.
^ permalink raw reply
* Re: linux-next: manual merge of the target-bva tree with the target-updates tree
From: Stephen Rothwell @ 2017-06-01 23:28 UTC (permalink / raw)
To: Bart Van Assche
Cc: Nicholas A. Bellinger, linux-kernel@vger.kernel.org,
linux-next@vger.kernel.org
In-Reply-To: <aff8f6fa-89b4-3dee-2c3f-68eae613fbba@sandisk.com>
Hi Bart,
On Thu, 1 Jun 2017 14:14:06 -0700 Bart Van Assche <bart.vanassche@sandisk.com> wrote:
>
> On 05/31/17 22:04, Nicholas A. Bellinger wrote:
> > Go ahead and get list review on drivers/target/ changes before pushing
> > them into linux-next, please.
> >
> > Btw, I don't care if you queue up one's that do have at least two
> > Reviewed-bys into your tree, but everything that doesn't have
> > Reviewed-bys or Acked-by should not be going into linux-next.
>
> It is not your job to rewrite the rules for linux-next. I'm following
> the guidelines I received from Stephen in December 2016. You were copied
> on the e-mail with guidelines Stephen sent to me. See also
> https://www.spinics.net/lists/linux-next/msg38488.html.
>
> Stephen, if anything would have changed in the meantime that I'm not
> aware of please let me know.
This is what I tell everyone:
"You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary."
Which is just what was in that message you pointed to. Note the
"reviewed by you (or another maintainer of your subsystem tree)". This
is more meant for the top level maintainers, but implies that the
patches have been reviewed, tested and are as ready as possible for
merging into the next level up tree.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: upcoming conflict between the target-updates and target-bva trees
From: Stephen Rothwell @ 2017-06-02 3:39 UTC (permalink / raw)
To: Nicholas A. Bellinger, Bart Van Assche
Cc: Linux Next Mailing List, Linux Kernel Mailing List
Hi all,
Last night the tagret-bva tree was rebased on top of the target-updates
tree. Just now, part of the target-updates tree has been rewritten.
So now I expect to get conflict(s) when I merge these trees since the
commits in the target-updates tree are no longer the same as those that
the target-bva tree was rebased on top of.
Please take a little time to sort out your development process.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the target-bva tree with the target-updates tree
From: Nicholas A. Bellinger @ 2017-06-02 3:58 UTC (permalink / raw)
To: Bart Van Assche
Cc: sfr@canb.auug.org.au, linux-kernel@vger.kernel.org,
linux-next@vger.kernel.org
In-Reply-To: <aff8f6fa-89b4-3dee-2c3f-68eae613fbba@sandisk.com>
On Thu, 2017-06-01 at 14:14 -0700, Bart Van Assche wrote:
> On 05/31/17 22:04, Nicholas A. Bellinger wrote:
> > Go ahead and get list review on drivers/target/ changes before pushing
> > them into linux-next, please.
> >
> > Btw, I don't care if you queue up one's that do have at least two
> > Reviewed-bys into your tree, but everything that doesn't have
> > Reviewed-bys or Acked-by should not be going into linux-next.
>
> It is not your job to rewrite the rules for linux-next. I'm following
> the guidelines I received from Stephen in December 2016. You were copied
> on the e-mail with guidelines Stephen sent to me. See also
> https://www.spinics.net/lists/linux-next/msg38488.html.
>
> Stephen, if anything would have changed in the meantime that I'm not
> aware of please let me know.
>
The point is you're not sending PULL requests.
But like I said earlier, I really don't care if you put patches that
have been reviewed into your tree for linux-next before I get a chance
to review and pick them up for target-pending.
However, you putting random un-reviewed changes is where I have to draw
the line, especially considering what happened earlier in year where
what you had in linux-next close to the merge window was completely and
utterly broken.
Would you put un-reviewed block and scsi changes into linux-next..?
What would those subsystem maintainers say about that..?
Why is drivers/target any different..?
^ permalink raw reply
* Re: linux-next: build warnings after merge of the drm tree
From: Stephen Rothwell @ 2017-06-02 3:59 UTC (permalink / raw)
To: Eric Anholt
Cc: Dave Airlie, Linux-Next Mailing List, Linux Kernel Mailing List,
Tom Cooksey, Daniel Vetter, Linus Walleij, Arnd Bergmann
In-Reply-To: <20170525114933.1e1dea04@canb.auug.org.au>
Hi all,
On Thu, 25 May 2017 11:49:42 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 19 May 2017 10:49:06 -0700 Eric Anholt <eric@anholt.net> wrote:
> >
> > Stephen Rothwell <sfr@canb.auug.org.au> writes:
> >
> > > After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
> > > produced these warnings:
> > >
> > > drivers/gpu/drm/pl111/pl111_drv.c:81:12: warning: 'pl111_modeset_init' defined but not used [-Wunused-function]
> > > static int pl111_modeset_init(struct drm_device *dev)
> > > ^
> > > drivers/gpu/drm/pl111/pl111_drv.c:149:26: warning: 'pl111_drm_driver' defined but not used [-Wunused-variable]
> > > static struct drm_driver pl111_drm_driver = {
> > > ^
> >
> > Sorry about that -- I thought that kbuild test robot would give me
> > notification of new warnings.
> >
> > Patch incoming.
>
> I saw the patch, but it doesn't seem to have been applied anywhere yet.
So these warnings went away yesterday, but are back today after quite a
few patches were dropped from the drm-misc tree.
Yesterday it contained theses (relative to the drm tree):
9a8d5e4a53dc drm/vc4: Fix comment in vc4_drv.h
66d6dd45eee2 drm/pl111: fix warnings without CONFIG_ARM_AMBA
91110a4b64fe drm/atomic: Consitfy mode parameter to drm_atomic_set_mode_for_crtc()
fb51cbfd4b2e drm/arcgpu: Drop drm_vblank_cleanup
e3ec0e1e38a5 drm/atmel: Drop drm_vblank_cleanup
85769cf7cd7f drm/imx: Drop drm_vblank_cleanup
a360b39b5137 drm/meson: Drop drm_vblank_cleanup
25b905fe4323 drm/stm: Drop drm_vblank_cleanup
d79373bd4d7e drm/sun4i: Drop drm_vblank_cleanup
8938d13585bc drm: better document how to send out the crtc disable event
46466b0dac3f drm: Use vsnprintf extension %ph
99cdb35e787b drm/doc: move printf helpers out of drmP.h
e7cc23de3e4e drm/pl111: select DRM_PANEL
7dbcbce9f551 drm/bridge: analogix-anx78xx: Use bridge->mode_valid() callback
faf94a0883ce drm: Use mode_valid() in atomic modeset
97f973d65260 drm: Use new mode_valid() helpers in connector probe helper
b1240f81a186 drm: Introduce drm_bridge_mode_valid()
da251bf8f935 drm: Add drm_{crtc/encoder/connector}_mode_valid()
18e51064c42c drm: Remove drm_device->virtdev
a301b1118615 drm: todo: remove task about switch to drm_connector_list_iter
eb53a46be597 drm: remove unsafe drm_for_each_connector()
4894bf711d19 drm/vc4: use drm_for_each_connector_iter()
875dd62697fe drm/nouveau: use drm_for_each_connector_iter()
c8bf8b968adb drm/mediatek: use drm_for_each_connector_iter()
2fd96b4116bf drm/i915: use drm_for_each_connector_iter()
2cbeb64f6c70 drm/rockchip: use drm_for_each_connector_iter()
48a92916729b drm/exynos: use drm_for_each_connector_iter()
Today it only has:
2d7b56378d32 drm/rockchip: gem: add the lacks lock and trivial changes
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: upcoming conflict between the target-updates and target-bva trees
From: Nicholas A. Bellinger @ 2017-06-02 4:03 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Bart Van Assche, Linux Next Mailing List,
Linux Kernel Mailing List
In-Reply-To: <20170602133928.2afa3e7a@canb.auug.org.au>
On Fri, 2017-06-02 at 13:39 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Last night the tagret-bva tree was rebased on top of the target-updates
> tree. Just now, part of the target-updates tree has been rewritten.
> So now I expect to get conflict(s) when I merge these trees since the
> commits in the target-updates tree are no longer the same as those that
> the target-bva tree was rebased on top of.
>
> Please take a little time to sort out your development process.
>
Unfortunately, this is going to continue to be a problem once these
patches are list reviewed, and included in target-updates.
Bart, can you please drop the patches until they are list reviewed so
there isn't a constant stream of merge conflicts in linux-next for your
un-reviewed code..?
^ permalink raw reply
* linux-next: manual merge of the target-bva tree with the target-updates tree
From: Stephen Rothwell @ 2017-06-02 4:05 UTC (permalink / raw)
To: Bart Van Assche, Nicholas A. Bellinger
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
Hi Bart,
Today's linux-next merge of the target-bva tree got a conflict in:
drivers/target/target_core_tpg.c
between commits:
06fd91ce633d ("target/configfs: Kill se_lun->lun_link_magic")
4f61e1e687c4 ("target: Avoid target_shutdown_sessions loop during queue_depth change")
from the target-updates tree and commits:
ba438d7c8d39 ("target: Avoid target_shutdown_sessions loop during queue_depth change")
b968ec8ff101 ("target/configfs: Kill se_lun->lun_link_magic")
from the target-bva tree.
I fixed it up (I used the version from the target-updates tree) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the target-bva tree with the target-updates tree
From: Stephen Rothwell @ 2017-06-02 4:11 UTC (permalink / raw)
To: Bart Van Assche, Nicholas A. Bellinger
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
In-Reply-To: <20170602140535.17d87d58@canb.auug.org.au>
Hi all,
On Fri, 2 Jun 2017 14:05:35 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the target-bva tree got a conflict in:
>
> drivers/target/target_core_tpg.c
>
> between commits:
>
> 06fd91ce633d ("target/configfs: Kill se_lun->lun_link_magic")
> 4f61e1e687c4 ("target: Avoid target_shutdown_sessions loop during queue_depth change")
>
> from the target-updates tree and commits:
>
> ba438d7c8d39 ("target: Avoid target_shutdown_sessions loop during queue_depth change")
> b968ec8ff101 ("target/configfs: Kill se_lun->lun_link_magic")
>
> from the target-bva tree.
>
> I fixed it up (I used the version from the target-updates tree) and can
Which turned out to be the wrong thing to do (or more was needed) as
the result does not build :-(.
I have just dropped the target-bva tree for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: upcoming conflict between the target-updates and target-bva trees
From: Bart Van Assche @ 2017-06-02 4:55 UTC (permalink / raw)
To: Nicholas A. Bellinger, Stephen Rothwell
Cc: Linux Next Mailing List, Linux Kernel Mailing List
In-Reply-To: <1496376224.27407.228.camel@haakon3.risingtidesystems.com>
On 06/01/17 21:03, Nicholas A. Bellinger wrote:
> On Fri, 2017-06-02 at 13:39 +1000, Stephen Rothwell wrote:
>> Last night the target-bva tree was rebased on top of the target-updates
>> tree. Just now, part of the target-updates tree has been rewritten.
>> So now I expect to get conflict(s) when I merge these trees since the
>> commits in the target-updates tree are no longer the same as those that
>> the target-bva tree was rebased on top of.
>>
>> Please take a little time to sort out your development process.
>
> Unfortunately, this is going to continue to be a problem once these
> patches are list reviewed, and included in target-updates.
>
> Bart, can you please drop the patches?
Hello Stephen and Nic,
I have just reset that branch to v4.12-rc1. Sorry for the inconvenience.
Bart.
^ permalink raw reply
* linux-next: Tree for Jun 2
From: Stephen Rothwell @ 2017-06-02 5:52 UTC (permalink / raw)
To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List
Hi all,
Changes since 20170601:
The mfd tree still had its build failure so I used the version from
next-20170530.
The target-bva tree gained a conflict against the target-updates tree but
the resolution just caused a build failure, so I dropped the target-bva
tree for today.
Non-merge commits (relative to Linus' tree): 3638
3852 files changed, 149384 insertions(+), 80061 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 263 trees (counting Linus' and 41 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (9ea15a59c39d Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging fixes/master (97da3854c526 Linux 4.11-rc3)
Merging kbuild-current/fixes (05d8cba4a1e8 kbuild: skip install/check of headers right under uapi directories)
Merging arc-current/for-curr (a4da5b17736d arc: Set IO-coherency aperture base to LINUX_LINK_BASE)
Merging arm-current/fixes (9861991321ec ARM: 8677/1: boot/compressed: fix decompressor header layout for v7-M)
Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (0e5e7f5e9700 powerpc/64: Reclaim CPU_FTR_SUBCORE)
Merging sparc/master (0fde7ad71ee3 sparc64: Fix build warnings with gcc 7.)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (58a6960663a1 Merge branch 'ARM-imx6ul-14x14-evk-Fix-suspend-over-nfs-by-phy')
Merging ipsec/master (a486cd23661c xfrm: fix state migration copy replay sequence numbers)
Merging netfilter/master (468b0df61a51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections)
Merging wireless-drivers/master (6d18c732b95c bridge: start hello_timer when enabling KERNEL_STP in br_stp_start)
Merging mac80211/master (7a7c0a6438b8 mac80211: fix TX aggregation start/stop callback race)
Merging sound-current/for-linus (d2c3b14e1f0d ALSA: hda - Fix applying MSI dual-codec mobo quirk)
Merging pci-current/for-linus (bd2df9b1e094 PCI: Make error code types consistent in pci_{read,write}_config_*)
Merging driver-core.current/driver-core-linus (08332893e37a Linux 4.12-rc2)
Merging tty.current/tty-linus (5ed02dbb4974 Linux 4.12-rc3)
Merging usb.current/usb-linus (b3addcf0d1f0 usb: musb: dsps: keep VBUS on for host-only mode)
Merging usb-gadget-fixes/fixes (a351e9b9fc24 Linux 4.11)
Merging usb-serial-fixes/usb-linus (5ed02dbb4974 Linux 4.12-rc3)
Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show)
Merging phy/fixes (9605bc46433d phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer)
Merging staging.current/staging-linus (3d51b9562673 staging: ccree: add CRYPTO dependency)
Merging char-misc.current/char-misc-linus (cdc1daca1b9b MAINTAINERS: Change maintainer of genwqe driver)
Merging input-current/for-linus (2fef826e45c6 Input: synaptics - tell users to report when they should be using rmi-smbus)
Merging crypto-current/master (f3ad587070d6 crypto: gcm - wait for crypto op not signal safe)
Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination)
Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6)
Merging kselftest-fixes/fixes (2ea659a9ef48 Linux 4.12-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 nand-fixes/nand/fixes (d4ed3b9015b5 mtd: nand: make nand_ooblayout_lp_hamming_ops static)
Merging spi-nor-fixes/spi-nor/fixes (2ea659a9ef48 Linux 4.12-rc1)
Merging mfd-fixes/for-mfd-fixes (b2376407f989 mfd: cros-ec: Fix host command buffer size)
Merging v4l-dvb-fixes/fixes (dd8245f445f5 [media] atomisp: don't treat warnings as errors)
Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded)
Merging drm-intel-fixes/for-linux-next-fixes (9bd9590997b9 drm/i915: Stop pretending to mask/unmask LPE audio interrupts)
Merging drm-misc-fixes/for-linux-next-fixes (869e188a35c9 drm: Fix locking in drm_atomic_helper_resume)
Merging kbuild/for-next (547b9255cde5 Merge branch 'fixes' into for-next)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging arm/for-next (e8fa27d7428e Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (2ea659a9ef48 Linux 4.12-rc1)
Merging arm-soc/for-next (a8854d66fe2c arm-soc: document merges)
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
Merging amlogic/for-next (69f33fe16f5d Merge branch 'v4.13/defconfig' into tmp/aml-rebuild)
Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next)
Merging at91/at91-next (7d9fb74454a7 Merge branch 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (c156bb73ae01 Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (428c917deaaf Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (b45371147f9d Merge branch 'for_4.13/keystone_dts' into next)
Merging mvebu/for-next (e629b4b1c763 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (78f9b622f8a9 Merge branch 'omap-for-v4.13/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging reset/reset/next (cae285ea12b5 dt-bindings: reset: Add reset manager offsets for Stratix10)
Merging qcom/for-next (bca31d5e9dcb Merge branch 'arm64-for-4.13' into all-for-4.13)
Merging realtek/realtek/for-next (af5f7bdb3c04 Merge branch 'realtek/v4.12/dt64' into next)
Merging renesas/next (bfcadd8730e0 Merge branches 'arm64-dt-for-v4.13' and 'dt-for-v4.13' into next)
Merging rockchip/for-next (7de9be9b8bfa Merge branch 'v4.13-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging samsung-krzk/for-next (1d3086334f59 Merge branch 'next/soc' into for-next)
Merging sunxi/sunxi/for-next (c0ded877427a Merge branches)
Merging tegra/for-next (29d04525797f Merge branch for-4.12/clk into for-next)
Merging arm64/for-next/core (1151f838cb62 arm64: kernel: restrict /dev/mem read() calls to linear region)
Merging clk/clk-next (fca63efe6eaf Merge branch 'clk-ap806' into clk-next)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (1072734a2c63 m68k/defconfig: Update defconfigs for v4.12-rc1)
Merging m68knommu/for-next (5ed02dbb4974 Linux 4.12-rc3)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
Merging microblaze/next (83f0124ad81e microblaze: remove asm-generic wrapper headers)
Merging mips/mips-for-linux-next (bc53f9c58065 Merge branch '4.12-fixes' into mips-for-linux-next)
Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation)
Merging openrisc/for-next (8d797f3169d1 openrisc: explicitly include linux/bug.h in asm/fixmap.h)
Merging parisc-hd/for-next (5aa2aabff1ce parisc: Stop CPUs via PAT firmware before system halt or reboot.)
Merging powerpc/next (83a092cf95f2 powerpc: Link warning for orphan sections)
Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (5a4356351194 s390/facilities: remove stfle requirement)
Merging sparc-next/master (60925ee97e2b Merge branch 'sparc64-queued-locks')
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory)
Merging uml/linux-next (ce4586063f1a um: Add missing NR_CPUS include)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6fad04b7585d Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (6f9d696f016f fscrypt: correct collision claim for digested names)
Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (4a44f70d220c Merge branch 'for-next-next-v4.13-20170531' into for-next-20170531)
Merging ceph/master (6ac56951dc10 rbd: implement REQ_OP_WRITE_ZEROES)
Merging cifs/for-next (a95cfad947d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (d8747d642ec4 reiserfs: Make flush bios explicitely sync)
Merging ext4/dev (67a7d5f561f4 ext4: fix fdatasync(2) after extent manipulation operations)
Merging f2fs/dev (1b7d8dd63b27 f2fs: fix a panic caused by NULL flush_cmd_control)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (0b6e9ea041e6 fuse: Add support for pid namespaces)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (6ea44adce915 SUNRPC: ensure correct error is reported by xs_tcp_setup_socket())
Merging nfsd/nfsd-next (bb2a8b0cd116 nfsd4: const-ify nfsd4_ops)
Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
Merging overlayfs/overlayfs-next (a082c6f680da ovl: filter trusted xattr for non-admin)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (7bccd12d27b7 ubi: Add debugfs file for tracking PEB state)
Merging xfs/for-next (161f55efba5d xfs: fix use-after-free in xfs_finish_page_writeback)
Merging file-locks/linux-next (94073ad77fff fs/locks: don't mess with the address limit in compat_fcntl64)
Merging vfs/for-next (919bb328b020 Merge branch 'work.misc' into for-next)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (719f6a7040f1 printk: Use the main logbuf in NMI when logbuf_lock is available)
Merging pci/next (c823e5b95885 Merge branch 'pci/host-xilinx' into next)
Merging pstore/for-next/pstore (d3762358a739 pstore: Fix format string to use %u for record id)
Merging hid/for-next (698be82b960a Merge branch 'for-4.13/ish' into for-next)
Merging i2c/i2c/for-next (61e3d0f79d6e i2c: reformat core-base file header)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (b3398adc0da6 firmware: dmi_scan: Look for SMBIOS 3 entry point first)
Merging hwmon-staging/hwmon-next (9a7967c91695 hwmon: (ibmpowernv) Add highest/lowest attributes to sensors)
Merging jc_docs/docs-next (6312811be26f Merge remote-tracking branch 'mauro-exp/docbook3' into death-to-docbook)
Merging v4l-dvb/master (36bcba973ad4 [media] mtk_vcodec_dec: return error at mtk_vdec_pic_info_update())
Merging v4l-dvb-next/master (791a9a666d1a Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging fbdev/fbdev-for-next (34bf129a7f06 fbdev: sti: don't select CONFIG_VT)
Merging pm/linux-next (0ab35512dd7c Merge branch 'pm-cpufreq' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (cb15c81a0c1c Merge branch 'thermal-soc' into next)
Merging thermal-soc/next (33011c583fcc Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (591c3beb86c4 dlm: Delete an unnecessary variable initialisation in dlm_ls_start())
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (0c34ca478ad5 Merge branch 'dsa-tagger-simplification')
CONFLICT (content): Merge conflict in drivers/net/phy/marvell.c
Merging ipsec-next/master (d49c9dc1c848 ipv6: remove unused variables in esp6)
Merging netfilter-next/master (34158151d2aa netfilter: cttimeout: use nf_ct_iterate_cleanup_net to unlink timeout objs)
Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period)
Merging wireless-drivers-next/master (219569ad0c41 rsi: use subdirectory for firmware file)
Merging bluetooth/master (a3995460491d net: phy: Relax error checking on sysfs_create_link())
Merging mac80211-next/master (5d473fedd17a mac80211: Invoke TX LED in more code paths)
Merging rdma/for-next (5ed02dbb4974 Linux 4.12-rc3)
Merging gfs2/for-next (3ef2bc099d1c Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux)
Merging mtd/master (05e97a9eda72 Merge tag 'nand/fixes-for-4.12-rc3' of git://git.infradead.org/linux-mtd into MTD)
Merging l2-mtd/master (44225c9c79ae mtd: mchp23k256: switch to mtd_device_register())
Merging nand/nand/next (30ee809e980b mtd: nand: mediatek: add support for MT2712 NAND FLASH Controller)
Merging spi-nor/spi-nor/next (05d090f00203 mtd: spi-nor: Potential oops on error path in quad_enable())
Merging crypto/master (284e76387c38 hw_random: timeriomem_rng: Allow setting RNG quality from platform data)
Merging drm/drm-next (2a1720376add Backmerge tag 'v4.12-rc3' into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_shrinker.c
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (20bb377106af drm/i915: Fix logical inversion for gen4 quirking)
Merging drm-tegra/drm/tegra/for-next (b0d36daa0ab5 gpu: host1x: Fix host1x driver shutdown)
Merging drm-misc/for-linux-next (2d7b56378d32 drm/rockchip: gem: add the lacks lock and trivial changes)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (98db803f6413 msm/drm: gpu: Dynamically locate the clocks from the device tree)
Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address)
Merging mali-dp/for-upstream/mali-dp (763656d30b3d drm: mali-dp: use div_u64 for expensive 64-bit divisions)
Merging sunxi-drm/sunxi-drm/for-next (110d33dd428e drm/sun4i: Add compatible for the A10s pipeline)
Merging imx-drm/imx-drm/next (b8f0951de854 gpu: ipu-v3: prg: remove counter load enable)
Merging etnaviv/etnaviv/next (d79fd1ccf2cd drm/etnaviv: implement cooling support for new GPU cores)
Merging kspp/for-next/kspp (4b49d6a66b06 Merge branch 'for-next/gcc-plugin/randstruct' into for-next/kspp)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (7421a1671abe ALSA: pcm: include pcm_local.h and remove some extraneous tabs)
Merging sound-asoc/for-next (aed323d42578 Merge remote-tracking branches 'asoc/topic/stm32', 'asoc/topic/sunxi', 'asoc/topic/tlv320dac31xx' and 'asoc/topic/wm-adsp' into asoc-next)
Merging modules/modules-next (3e2e857f9c3a module: Add module name to modinfo)
Merging input/next (32a62b9441d8 Input: synaptics-rmi4 - change a char type to u8)
Merging block/for-next (fe02d46ab775 Merge branch 'for-4.13/block' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (d8fc98f845c9 dm kcopyd: add sequential write feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (6e75316c15df mmc: tmio: make sure SDIO gets reinitialized after resume)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (5a8948f8a32b md: Make flush bios explicitely sync)
Merging mfd/for-mfd-next (60194d283dcf mfd: intel_quark_i2c_gpio: Add support for SIMATIC IOT2000 platform)
$ git reset --hard HEAD^
Merging next-20170530 version of mfd
Merging backlight/for-backlight-next (e739c5bb20be backlight: Add support for Arctic Sand LED backlight driver chips)
Merging battery/for-next (b5910897b2ee power_supply: Add Apple Brick ID power supply type)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (af7a73de20f9 Merge remote-tracking branches 'regulator/topic/settle' and 'regulator/topic/tps65917' into regulator-next)
Merging security/next (d68c51e0b377 Sync to mainline for security submaintainers to work against)
Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.)
Merging keys/keys-next (e36484b5ac31 crypto : asymmetric_keys : verify_pefile:zero memory content before freeing)
Merging selinux/next (409dcf31538a selinux: Add a cache for quicker retreival of PKey SIDs)
Merging tpmdd/next (ffd526e290f1 tpm: vtpm_proxy: Suppress error logging when in closed state)
Merging watchdog/master (08332893e37a Linux 4.12-rc2)
Merging iommu/next (752b80575ea4 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/core', 'x86/vt-d' and 'x86/amd' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (7cb671e7a34d vfio/type1: Reduce repetitive calls in vfio_pin_pages_remote())
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
Merging audit/next (7786f6b6dfc1 audit: add ambient capabilities to CAPSET and BPRM_FCAPS records)
Merging devicetree/for-next (08cd94ec522b dt-bindings: net: move FMan binding)
Merging mailbox/mailbox-for-next (cb710ab1d8a2 mailbox: handle empty message in tx_tick)
Merging spi/for-next (b8076f1a1d44 Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave', 'spi/topic/spidev' and 'spi/topic/st-ssc4' into spi-next)
Merging tip/auto-latest (8e3c0499d0c9 Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (6f9c89000c3f Merge tag 'arch-timer-errata' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into clockevents/4.12)
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (cf97825862f0 EDAC, thunderx: Fix a warning during l2c debugfs node creation)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (6ee98ffeea0b x86/ftrace: Make sure that ftrace trampolines are not RWX)
Merging rcu/rcu/next (ce0407e1e883 rcutorture: Don't wait for kernel when all builds fail)
Merging kvm/linux-next (9d643f63128b KVM: x86: avoid large stack allocations in em_fxrstor)
Merging kvm-arm/next (a2b19e6e2d4b KVM: arm/arm64: vgic-its: Cleanup after failed ITT restore)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (76d837a4c0f9 KVM: PPC: Book3S PR: Don't include SPAPR TCE code on non-pseries platforms)
Merging kvms390/next (a2bdbb2c7e70 KVM: s390: ioctls to get and set guest storage attributes)
Merging xen-tip/linux-next (c71e6d804c88 xen: make xen_flush_tlb_all() static)
Merging percpu/for-next (1328710b8ec3 mark most percpu globals as __ro_after_init)
Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next)
Merging drivers-x86/for-next (6bee1af9dcaa platform/x86: intel_pmc_ipc: Mark ipc_data_readb() as __maybe_unused)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (3026050179a3 HSI: ssi_protocol: double free in ssip_pn_xmit())
Merging leds/for-next (71c17b06ef7d leds: trigger: gpio: Use threaded IRQ)
Merging ipmi/for-next (bf10ff69dd6e ipmi_ssif: remove redundant null check on array client->adapter->name)
Merging driver-core/driver-core-next (e622ec579b9a doc: update kernel version in sysfs-uevent ABI doc)
Merging usb/usb-next (7f7c3cde613d uwb: i1480: add missing goto)
Merging usb-gadget/next (2868b2513aa7 Merge tag 'linux-kselftest-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest)
Merging usb-serial/usb-next (4cd4475effd8 USB: serial: upd78f0730: make constants static)
Merging usb-chipidea-next/ci-for-usb-next (c4a0bbbdb7f6 usb: chipidea: properly handle host or gadget initialization failure)
Merging phy-next/next (0b56e9a7e835 phy: Group vendor specific phy drivers)
Merging tty/tty-next (aa668632ae8c Merge 4.12-rc3 into tty-next)
Merging char-misc/char-misc-next (46505c802a55 Revert "firmware: vpd: remove platform driver")
Merging extcon/extcon-next (a781a7d646ad extcon: qcom-spmi-misc: add dependency on ARCH_QCOM)
Merging staging/staging-next (ca9280d1f82a Merge tag 'iio-for-4.13a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
Merging mux/for-next (a351e9b9fc24 Linux 4.11)
Merging slave-dma/next (2f12f9eac2ae Merge branch 'topic/pl330' into next)
Merging cgroup/for-next (41c25707d217 cpuset: consider dying css as offline)
Merging scsi/for-next (35f07119477d Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (52f866197057 scsi: lpfc: fix spelling mistake "entrys" -> "entries")
Merging target-updates/for-next (4f61e1e687c4 target: Avoid target_shutdown_sessions loop during queue_depth change)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (a24cd101dec9 tcm_qla2xxx: Simplify the code for handling aborted commands)
CONFLICT (content): Merge conflict in drivers/target/target_core_tpg.c
$ git reset --hard HEAD^
Merging libata/for-next (d1020a116c4a Merge branch 'for-4.12-fixes' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (c8b0d7290657 s390/virtio: change maintainership)
Merging rpmsg/for-next (0696d197bda1 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (7043bc081bd1 Merge branch 'devel' into for-next)
Merging pinctrl/for-next (62edf480d86a Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging pinctrl-samsung/for-next (eb1c179c966a pinctrl: samsung: Explicitly cast pointer returned by of_iomap() to iomem)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (97512ceafaac Merge branch 'for-4.12/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 (296990deb389 mnt: Make propagate_umount less slow for overlapping mount propagation trees)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (9dfa7bba35ac fix race in drivers/char/random.c:get_reg())
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (2ea659a9ef48 Linux 4.12-rc1)
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (c87a040fb6c5 Merge branch 'for-4.12/upstream-fixes' into for-next)
Merging coresight/next (44389a7d12ec coresight: add support for CPU debug module)
Merging rtc/rtc-next (a21512c1698d rtc.txt: standardize document format)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (f5705aa8cfed dax, xfs, ext4: compile out iomap-dax paths in the FS_DAX=n case)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
Merging akpm-current/current (d25f0d9c6100 ipc/util.h: update documentation for ipc_getref() and ipc_putref())
$ git checkout -b akpm remotes/origin/akpm/master
Applying: sparc64: NG4 memset 32 bits overflow
Applying: xtensa: use generic fb.h
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
Merging akpm/master (4864da1c7bd1 lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
^ permalink raw reply
* next-20170602 build: 0 failures 0 warnings (next-20170602)
From: Build bot for Mark Brown @ 2017-06-02 9:52 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170602
Git describe: next-20170602
Commit: 8adac26418 Add linux-next specific files for 20170602
Build Time: 119 min 43 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 0
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
-------------------------------------------------------------------------------
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm64-allmodconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allmodconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* [PATCH] staging: rtl8188eu: style fixes
From: Galo @ 2017-06-02 14:36 UTC (permalink / raw)
To: linux-next; +Cc: Greg Kroah-Hartman, Larry Finger
Fix several "CHECK: spaces preferred around that .." checks.
Signed-off-by: Galo Navarro <anglor@varoa.net>
---
drivers/staging/rtl8188eu/core/rtw_mlme.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index de9ab59..92f7297 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -370,14 +370,14 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
sq_final = padapter->recvpriv.signal_qual;
/* the rssi value here is undecorated, and will be used for antenna diversity */
if (sq_smp != 101) /* from the right channel */
- rssi_final = (src->Rssi+dst->Rssi*4)/5;
+ rssi_final = (src->Rssi + dst->Rssi * 4) / 5;
else
rssi_final = rssi_ori;
} else {
if (sq_smp != 101) { /* from the right channel */
ss_final = ((u32)(src->PhyInfo.SignalStrength)+(u32)(dst->PhyInfo.SignalStrength)*4)/5;
sq_final = ((u32)(src->PhyInfo.SignalQuality)+(u32)(dst->PhyInfo.SignalQuality)*4)/5;
- rssi_final = (src->Rssi+dst->Rssi*4)/5;
+ rssi_final = (src->Rssi + dst->Rssi * 4) / 5;
} else {
/* bss info not receiving from the right channel, use the original RX signal infos */
ss_final = dst->PhyInfo.SignalStrength;
@@ -1926,7 +1926,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
if (pqospriv->qos_option == 0) {
out_len = *pout_len;
- rtw_set_ie(out_ie+out_len, _VENDOR_SPECIFIC_IE_,
+ rtw_set_ie(out_ie + out_len, _VENDOR_SPECIFIC_IE_,
_WMM_IE_Length_, WMM_IE, pout_len);
pqospriv->qos_option = 1;
@@ -1964,10 +1964,10 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
phtpriv->ht_option = true;
- p = rtw_get_ie(in_ie+12, _HT_ADD_INFO_IE_, &ielen, in_len-12);
+ p = rtw_get_ie(in_ie + 12, _HT_ADD_INFO_IE_, &ielen, in_len - 12);
if (p && (ielen == sizeof(struct ieee80211_ht_addt_info))) {
out_len = *pout_len;
- rtw_set_ie(out_ie+out_len, _HT_ADD_INFO_IE_, ielen, p+2, pout_len);
+ rtw_set_ie(out_ie + out_len, _HT_ADD_INFO_IE_, ielen, p + 2, pout_len);
}
}
return phtpriv->ht_option;
@@ -2058,8 +2058,8 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
phtpriv = &psta->htpriv;
if ((phtpriv->ht_option) && (phtpriv->ampdu_enable)) {
- issued = (phtpriv->agg_enable_bitmap>>priority)&0x1;
- issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1;
+ issued = (phtpriv->agg_enable_bitmap >> priority) & 0x1;
+ issued |= (phtpriv->candidate_tid_bitmap >> priority) & 0x1;
if (issued == 0) {
DBG_88E("rtw_issue_addbareq_cmd, p=%d\n", priority);
--
2.1.4
^ permalink raw reply related
* Re: [PATCH] staging: rtl8188eu: style fixes
From: Nicholas Mc Guire @ 2017-06-02 17:41 UTC (permalink / raw)
To: Galo; +Cc: linux-next, Greg Kroah-Hartman, Larry Finger
In-Reply-To: <20170602143643.GA9038@lear>
On Fri, Jun 02, 2017 at 04:36:44PM +0200, Galo wrote:
> Fix several "CHECK: spaces preferred around that .." checks.
>
> Signed-off-by: Galo Navarro <anglor@varoa.net>
cleanup patches are ok - but if you do cleanups you should also
run checkpatch.pl on your patch. This would have shown you that
two of the lines you fixed are over 80 char and should be broken
Also I do not see much sense in picking out individual lines for
space fixing and leaving other adjacent lines out e.g.:
ss_final = ((u32)(src->PhyInfo.SignalStrength)+(u32)(dst->PhyInfo.SignalStrength)*4)/5;
sq_final = ((u32)(src->PhyInfo.SignalQuality)+(u32)(dst->PhyInfo.SignalQuality)*4)/5;
rssi_final = (src->Rssi+dst->Rssi*4)/5;
All three lines have the same spacing issue - but your patch addresses
the last line only. While it is ok not to fix all spacing issues in a
file at once I think that at least within a basic block one should keep
it consistent. style cleanup intends to make code more readable but if
styles are mixed on a line-by-line basis this goal is hardly achieved
I would prefere you redo this patch and ensure at least local consistency
>
> ---
> drivers/staging/rtl8188eu/core/rtw_mlme.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> index de9ab59..92f7297 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> @@ -370,14 +370,14 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
> sq_final = padapter->recvpriv.signal_qual;
> /* the rssi value here is undecorated, and will be used for antenna diversity */
> if (sq_smp != 101) /* from the right channel */
> - rssi_final = (src->Rssi+dst->Rssi*4)/5;
> + rssi_final = (src->Rssi + dst->Rssi * 4) / 5;
> else
> rssi_final = rssi_ori;
> } else {
> if (sq_smp != 101) { /* from the right channel */
> ss_final = ((u32)(src->PhyInfo.SignalStrength)+(u32)(dst->PhyInfo.SignalStrength)*4)/5;
> sq_final = ((u32)(src->PhyInfo.SignalQuality)+(u32)(dst->PhyInfo.SignalQuality)*4)/5;
> - rssi_final = (src->Rssi+dst->Rssi*4)/5;
> + rssi_final = (src->Rssi + dst->Rssi * 4) / 5;
> } else {
> /* bss info not receiving from the right channel, use the original RX signal infos */
> ss_final = dst->PhyInfo.SignalStrength;
> @@ -1926,7 +1926,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
>
> if (pqospriv->qos_option == 0) {
> out_len = *pout_len;
> - rtw_set_ie(out_ie+out_len, _VENDOR_SPECIFIC_IE_,
> + rtw_set_ie(out_ie + out_len, _VENDOR_SPECIFIC_IE_,
> _WMM_IE_Length_, WMM_IE, pout_len);
>
> pqospriv->qos_option = 1;
> @@ -1964,10 +1964,10 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
>
> phtpriv->ht_option = true;
>
> - p = rtw_get_ie(in_ie+12, _HT_ADD_INFO_IE_, &ielen, in_len-12);
> + p = rtw_get_ie(in_ie + 12, _HT_ADD_INFO_IE_, &ielen, in_len - 12);
p = rtw_get_ie(in_ie + 12, _HT_ADD_INFO_IE_, &ielen,
in_len - 12);
> if (p && (ielen == sizeof(struct ieee80211_ht_addt_info))) {
> out_len = *pout_len;
> - rtw_set_ie(out_ie+out_len, _HT_ADD_INFO_IE_, ielen, p+2, pout_len);
> + rtw_set_ie(out_ie + out_len, _HT_ADD_INFO_IE_, ielen, p + 2, pout_len);
rtw_set_ie(out_ie + out_len, _HT_ADD_INFO_IE_, ielen,
p + 2, pout_len);
> }
> }
> return phtpriv->ht_option;
> @@ -2058,8 +2058,8 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
> phtpriv = &psta->htpriv;
>
> if ((phtpriv->ht_option) && (phtpriv->ampdu_enable)) {
> - issued = (phtpriv->agg_enable_bitmap>>priority)&0x1;
> - issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1;
> + issued = (phtpriv->agg_enable_bitmap >> priority) & 0x1;
> + issued |= (phtpriv->candidate_tid_bitmap >> priority) & 0x1;
>
> if (issued == 0) {
> DBG_88E("rtw_issue_addbareq_cmd, p=%d\n", priority);
> --
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
thx!
hofrat
^ 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