* Re: mwifiex: Fixed endianness for event TLV type TLV_BTCOEX_WL_SCANTIME
From: Kalle Valo @ 2016-06-29 15:52 UTC (permalink / raw)
To: Prasun Maiti
Cc: Amitkumar Karwar, Nishant Sarmukadam, Linux Wireless, Linux Next,
Linux Kernel
In-Reply-To: <1466050770-21789-1-git-send-email-prasunmaiti87@gmail.com>
Prasun Maiti <prasunmaiti87@gmail.com> wrote:
> The two members min_scan_time and max_scan_time of structure
> "mwifiex_ie_types_btcoex_scan_time" are of two bytes each. The values
> are assigned directtly from firmware without endian conversion handling.
> So, wrong datas will get saved in big-endian systems.
>
> This patch converts the values into cpu's byte order before assigning them
> into the local members.
>
> Signed-off-by: Prasun Maiti <prasunmaiti87@gmail.com>
I would like to see Reviewed-by from someone else before I apply this.
--
Sent by pwcli
https://patchwork.kernel.org/patch/9179811/
^ permalink raw reply
* Re: next-20160629 build: 2 failures 4 warnings (next-20160629)
From: Arnd Bergmann @ 2016-06-29 14:53 UTC (permalink / raw)
To: linaro-kernel
Cc: Build bot for Mark Brown, kernel-build-reports, linux-next,
Stephen Rothwell
In-Reply-To: <E1bIBcE-0003jN-K9@optimist>
On Wednesday, June 29, 2016 10:17:02 AM CEST Build bot for Mark Brown wrote:
> Tree/Branch: next-20160629
> arm64-allmodconfig
> ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
The dri-devel and asoc-devel trees clashed, I just sent a fix, but
we cannot apply it unless both branches are merged.
>
> Warnings Summary: 4
> 1 ../include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
> 1 ../drivers/tty/serial/8250/8250_fintek.c:34:0: warning: "IRQ_MODE" redefined
> 1 ../arch/arm/mach-s3c64xx/common.h:28:2: warning: its scope is only this definition or declaration, which is probably not what you want
> 1 ../arch/arm/mach-s3c64xx/common.h:28:2: warning: 'struct device_node' declared inside parameter list
Sent fixes for these all before.
Arnd
^ permalink raw reply
* next-20160629 build: 2 failures 4 warnings (next-20160629)
From: Build bot for Mark Brown @ 2016-06-29 9:17 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160629
Git describe: next-20160629
Commit: b07695ee86 Add linux-next specific files for 20160629
Build Time: 74 min 48 sec
Passed: 7 / 9 ( 77.78 %)
Failed: 2 / 9 ( 22.22 %)
Errors: 5
Warnings: 4
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
arm-allmodconfig
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : arm64-allmodconfig
3 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Errors summary: 5
2 ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
2 ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
2 ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
2 ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
2 ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
Warnings Summary: 4
1 ../include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
1 ../drivers/tty/serial/8250/8250_fintek.c:34:0: warning: "IRQ_MODE" redefined
1 ../arch/arm/mach-s3c64xx/common.h:28:2: warning: its scope is only this definition or declaration, which is probably not what you want
1 ../arch/arm/mach-s3c64xx/common.h:28:2: warning: 'struct device_node' declared inside parameter list
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 5 errors, 1 warnings, 0 section mismatches
Errors:
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
Warnings:
../include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 5 errors, 3 warnings, 0 section mismatches
Errors:
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
Warnings:
../arch/arm/mach-s3c64xx/common.h:28:2: warning: 'struct device_node' declared inside parameter list
../arch/arm/mach-s3c64xx/common.h:28:2: warning: its scope is only this definition or declaration, which is probably not what you want
../drivers/tty/serial/8250/8250_fintek.c:34:0: warning: "IRQ_MODE" redefined
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm64-defconfig
^ permalink raw reply
* linux-next: Tree for Jun 29
From: Stephen Rothwell @ 2016-06-29 6:36 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160628:
The powerpc tree gained a conflict against Linus' tree.
The devicetree tree gained a conflict against the imx-mxs tree.
The kvm tree gained a conflict against the s390 tree.
Non-merge commits (relative to Linus' tree): 5988
5753 files changed, 273776 insertions(+), 115639 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 235 trees (counting Linus' and 34 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (02184c60eba8 Merge tag 'for-v4.7-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply)
Merging fixes/master (5edb56491d48 Linux 4.7-rc3)
Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables)
Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled)
Merging arm-current/fixes (56530f5d2ddc ARM: 8579/1: mm: Fix definition of pmd_mknotpresent)
Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (844e3be47693 powerpc/bpf/jit: Disable classic BPF JIT on ppc64le)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (9a0fee2b552b sock_diag: do not broadcast raw socket destruction)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (370a8107e788 ipvs: fix bind to link-local mcast IPv6 address in backup)
Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git)
Merging mac80211/master (126e7557328a mac80211: Fix mesh estab_plinks counting in STA removal case)
Merging sound-current/for-linus (d5dbbe656948 ALSA: dummy: Fix a use-after-free at closing)
Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code)
Merging driver-core.current/driver-core-linus (33688abb2802 Linux 4.7-rc4)
Merging tty.current/tty-linus (5353ed8deede devpts: fix null pointer dereference on failed memory allocation)
Merging usb.current/usb-linus (ab2a4bf83902 USB: don't free bandwidth_mutex too early)
Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command)
Merging usb-serial-fixes/usb-linus (33688abb2802 Linux 4.7-rc4)
Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm)
Merging staging.current/staging-linus (df013212a1b6 Merge tag 'iio-fixes-for-4.7b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (33688abb2802 Linux 4.7-rc4)
Merging input-current/for-linus (60842ef8128e Input: vmmouse - remove port reservation)
Merging crypto-current/master (055ddaace035 crypto: user - re-add size check for CRYPTO_MSG_GETALG)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read)
Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (59461c018204 mfd: max77620: Fix FPS switch statements)
Merging drm-intel-fixes/for-linux-next-fixes (4c2e07c6a29e Linux 4.7-rc5)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled)
Merging arm/for-next (f07617e99523 Merge branches 'component', 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (1a695a905c18 Linux 4.7-rc1)
Merging arm-soc/for-next (fcfe0c8bf1fc ARM: SoC: Document merges)
Merging amlogic/for-next (cc989c0bfd53 Merge remote-tracking branch 'clk/clk-s905' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (aa5c0a1e15c2 Merge branch anholt/bcm2835-dt-64-next into for-next)
Merging berlin/berlin/for-next (1a695a905c18 Linux 4.7-rc1)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (63a404a3f177 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (eef6bb9fc17a Merge branch 'for_4.8/keystone' into next)
Merging mvebu/for-next (56454a34f5d6 Merge branch 'mvebu/defconfig64' into mvebu/for-next)
Merging omap/for-next (a68816dc4006 Merge branch 'omap-for-v4.8/soc' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (3b6d0be3e426 Merge tag 'qcom-dt-for-4.8' into all-for-4.8)
Merging renesas/next (334566aa6787 Merge branches 'heads/arm64-defconfig-for-v4.8', 'heads/arm64-dt-for-v4.8', 'heads/defconfig-for-v4.8', 'heads/dt-for-v4.8' and 'heads/soc-for-v4.8' into next)
Merging rockchip/for-next (339c7e214a46 Merge branch 'v4.8-armsoc/dts32' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (13fc4c900141 Merge branch 'for-v4.8/exynos-mfc' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi
Merging tegra/for-next (5bcc7efc04c3 Merge branch for-4.8/arm64 into for-next)
Merging arm64/for-next/core (9fdc14c55cd6 arm64: mm: fix location of _etext)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (70f4f9352317 ia64: efi: use timespec64 for persistent clock)
Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging m68knommu/for-next (33688abb2802 Linux 4.7-rc4)
Merging metag/for-next (592ddeeff8cb metag: Fix typos)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (847e858f3d0e SSB: Change bare unsigned to unsigned int to suit coding style)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging powerpc/next (cdb1b3424dba powerpc/pci: Reduce log level of PCI I/O space warning)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (25d539c9a958 s390/ptrace: clarify bits in the per_struct)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (893d66192c46 tile: support gcc 7 optimization to use __multi3)
Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7)
Merging btrfs-kdave/for-next (5027553b087e Merge branch 'for-next-next-4.7-20160623' into for-next-20160623)
Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache)
Merging cifs/for-next (fbe601f7a34b Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (40f0fd372a62 ecryptfs: fix spelling mistakes)
Merging ext3/for_next (e008bb6134a6 quota: use time64_t internally)
Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO)
Merging f2fs/dev (a2481adac819 f2fs: avoid latency-critical readahead of node pages)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (507c552aa58f fuse: improve aio directIO write performance for size extending writes)
Merging gfs2/for-next (fd4c5748b8d3 gfs2: writeout truncated pages)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (050702c1004c Merge branch 'writeback')
Merging nfsd/nfsd-next (ee8f2a36a99c nfsd: allow nfsd to advertise multiple layout types)
Merging orangefs/for-next (2dcd0af568b0 Linux 4.6)
Merging overlayfs/overlayfs-next (77abf0f6294d ovl: move some common code in a function)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4ac1c17b2044 UBIFS: Implement ->migratepage())
Merging xfs/for-next (f477cedc4e79 Merge branch 'xfs-4.8-misc-fixes-2' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (1eb82bc8e712 Merge branch 'for-linus' into for-next)
Merging pci/next (e0af5a975e77 Merge branch 'pci/resource' into next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging pstore/for-next/pstore (35da60941e44 pstore/ram: add Device Tree bindings)
Merging hid/for-next (5f00f0b8d58b Merge branch 'for-4.7/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (d86a4c24d68e Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (18c358ac5e32 Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (4e6163e859cd hwmon: (tmp102) Drop FSF address)
Merging v4l-dvb/master (ed5883b778c8 Merge branch 'patchwork' into to_next)
Merging pm/linux-next (ceff73db0e3d Merge branches 'pm-core' and 'pm-tools' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (2c5ce98e1e83 thermal: sysfs: add comments describing locking strategy)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
CONFLICT (add/add): Merge conflict in drivers/thermal/tango_thermal.c
CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c
CONFLICT (content): Merge conflict in drivers/hwmon/tmp102.c
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (73a14400c949 Merge branch 'topic/xilinx' into next)
Merging net-next/master (8a79813c1401 net: ethernet: dwc_eth_qos: use phy_ethtool_{get|set}_link_ksettings)
CONFLICT (content): Merge conflict in tools/virtio/ringtest/Makefile
CONFLICT (content): Merge conflict in net/sched/sch_netem.c
CONFLICT (content): Merge conflict in net/rds/tcp_listen.c
CONFLICT (content): Merge conflict in net/rds/tcp_connect.c
CONFLICT (content): Merge conflict in drivers/net/vrf.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/qlogic/qed/qed_hsi.h
CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec.h
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2-svk.dts
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (625b44fc15f8 ipvs: count pre-established TCP states as active)
Merging wireless-drivers-next/master (1bb57c8a5e33 Merge ath-next from ath.git)
Merging bluetooth/master (92890252babd ieee802154: allow netns create of lowpan interface)
Merging mac80211-next/master (e2815cf1fa28 mac80211: silence an uninitialized variable warning)
Merging rdma/for-next (fb92d8fb1b9c Merge branches 'cxgb4-4.8', 'mlx5-4.8' and 'fw-version' into k.o/for-4.8)
Merging rdma-leon/rdma-next (33688abb2802 Linux 4.7-rc4)
Merging rdma-leon-test/testing/rdma-next (33688abb2802 Linux 4.7-rc4)
Merging mtd/master (becc7ae544c6 MAINTAINERS: Add file patterns for mtd device tree bindings)
Merging l2-mtd/master (95193796256c mtd: m25p80: read in spi_max_transfer_size chunks)
Merging nand/nand/next (f5f2894f18af mtd: nand: sunxi: add reset line support)
Merging crypto/master (f8de55b6252b crypto: tcrypt - Use unsigned long for mb ahash cycle counter)
Merging drm/drm-next (2a3467063ae3 Merge tag 'mediatek-drm-2016-06-20' of git://git.pengutronix.de/git/pza/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/sun4i/sun4i_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/sti/sti_drv.c
Merging drm-panel/drm/panel/for-next (f103b93d90c2 drm/dsi: Add uevent callback)
Merging drm-intel/for-linux-next (a922eb8d4581 drm/i915: Removing PCI IDs that are no longer listed as Kabylake.)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbc.c
Merging drm-tegra/drm/tegra/for-next (575a892adaf7 gpu: host1x: Remove useless local variable)
Merging drm-misc/topic/drm-misc (c78d1ca2d2e3 drm: fix some spelling mistakes)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops)
Merging hdlcd/for-upstream/hdlcd (f6c68b4bd4a9 drm: hdlcd: Add information about the underlying framebuffers in debugfs)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (b7e7559f439c Merge branches 'sunxi/clk-fixes-for-4.7', 'sunxi/dt-for-4.8' and 'sunxi/fixes-for-4.7' into sunxi/for-next)
Merging kbuild/for-next (7e01dad0469b Merge branch 'kbuild/kbuild' into kbuild/for-next)
Applying: gcc-plugins: disable under COMPILE_TEST
Merging kspp/for-next/kspp (20f0992c935f latent_entropy: Add the extra_latent_entropy kernel parameter)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (e568f95409ca Merge remote-tracking branches 'regmap/topic/i2c', 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next)
Merging sound/for-next (3915bf294652 ALSA: seq_timer: use monotonic times internally)
Merging sound-asoc/for-next (27623e8a87fe Merge remote-tracking branches 'asoc/topic/wm8731', 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc-next)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (fcd6eb50eadd Input: add powerkey driver for HISI 65xx SoC)
Merging block/for-next (e118e4be8a96 Merge branch 'for-4.8/core' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in fs/btrfs/compression.c
CONFLICT (content): Merge conflict in block/blk-lib.c
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (0fe0a864be7f Merge branch 'dm-4.7' into for-next)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (466780648db4 mmc: sh_mmcif: Use a 10s timeout in the error recovery path)
Merging md/for-next (d787be4092e2 md: reduce the number of synchronize_rcu() calls when multiple devices fail.)
CONFLICT (content): Merge conflict in drivers/md/raid10.c
CONFLICT (content): Merge conflict in drivers/md/raid1.c
Merging mfd/for-mfd-next (1cf9326d4c07 mfd: max14577: Allow driver to be built as a module)
Merging backlight/for-backlight-next (4db8c9572ce1 backlight: lp855x: Add enable regulator)
Merging battery/master (0b7fe26ae602 power: qcom_smbb: Make an extcon for usb cable detection)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (fae9c48a23cf Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/qcom-spmi', 'regulator/topic/tps65218' and 'regulator/topic/twl' into regulator-next)
Merging security/next (f786b7520982 tpm_crb: fix address space of the return pointer in crb_map_res())
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging integrity/next (848b134bf8e7 ima: extend the measurement entry specific pcr)
Merging keys/keys-next (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3f09354ac84c netlabel: Implement CALIPSO config functions for SMACK.)
Merging tpmdd/next (f786b7520982 tpm_crb: fix address space of the return pointer in crb_map_res())
Merging watchdog/master (1a695a905c18 Linux 4.7-rc1)
Merging iommu/next (e45a4c9d4041 Merge branches 'iommu/fixes', 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek' and 'arm/msm' into next)
CONFLICT (content): Merge conflict in drivers/iommu/mtk_iommu.c
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (9698cbf0bea6 vfio: platform: support No-IOMMU mode)
Merging jc_docs/docs-next (17defc282fe6 Documentation: add meta-documentation for Sphinx and kernel-doc)
CONFLICT (content): Merge conflict in Documentation/index.rst
Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
Merging audit/next (86b2efbe3a39 audit: add fields to exclude filter by reusing user filter)
CONFLICT (content): Merge conflict in arch/s390/kernel/ptrace.c
Merging devicetree/for-next (15cc2ed6dcf9 of/irq: Mark initialised interrupt controllers as populated)
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx51.c
CONFLICT (content): Merge conflict in arch/arm/mach-bcm/board_bcm21664.c
Merging mailbox/mailbox-for-next (9ac3e85a5c5c mailbox: pl320: remove __raw IO)
Merging spi/for-next (f4848a57d763 Merge remote-tracking branches 'spi/topic/sunxi' and 'spi/topic/ti-qspi' into spi-next)
Merging tip/auto-latest (907012b1ab02 Merge branch 'x86/platform')
Merging clockevents/clockevents/next (3d802c5c8cfa Merge branches 'clockevents/clksrc-of-ret' and 'clockevents/compile-test' into clockevents/next)
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (a67adb32d941 ARM: dts: Add Arria10 Ethernet EDAC devicetree entry)
Merging irqchip/irqchip/for-next (77d50b17c990 Merge branch 'irqchip/misc' into irqchip/for-next)
Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID)
Merging rcu/rcu/next (6fdb862130dd fixup! rcu: Consolidate expedited grace period machinery)
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Applying: rcu: merge fix for kernel/rcu/tree_exp.h
Merging kvm/linux-next (8ff7b956471f Merge tag 'kvm-s390-next-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c
Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c
Applying: s390: merge fix up for __diag204 move
Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (fd7bacbca47a KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c
Merging kvms390/next (a411edf1320e KVM: s390: vsie: add module parameter "nested")
Merging xen-tip/linux-next (bdadcaf2a7c1 xen: remove incorrect forward declaration)
Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction)
Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads)
Merging drivers-x86/for-next (ab9bb11ccbaa dell-wmi: Add a WMI event code for display on/off)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (9c99e5e51988 HSI: omap_ssi: drop pm_runtime_irq_safe)
Merging leds/for-next (b1ae40a5db61 leds: Only descend into leds directory when CONFIG_NEW_LEDS is set)
Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init)
Merging driver-core/driver-core-next (33688abb2802 Linux 4.7-rc4)
Merging tty/tty-next (98f2082c3ac4 tty/serial: atmel: enforce tasklet init and termination sequences)
Merging usb/usb-next (aa5e94a2e133 Revert "usb: ohci-at91: Forcibly suspend ports while USB suspend")
Merging usb-gadget/next (1d23d16a88e6 usb: gadget: pch_udc: reorder spin_[un]lock to avoid deadlock)
Merging usb-serial/usb-next (33688abb2802 Linux 4.7-rc4)
Merging usb-chipidea-next/ci-for-usb-next (ebfad91c5da3 dt-bindings: ci-hdrc-usb2: s/gadget-itc-setting/itc-setting in example)
Merging staging/staging-next (b3e6916d6edf staging: wilc1000: fix return value check in wlan_initialize_threads())
CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/lloop.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/llite/lloop.c left in tree.
CONFLICT (modify/delete): drivers/staging/android/sync.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/android/sync.h left in tree.
$ git rm -f drivers/staging/lustre/lustre/llite/lloop.c drivers/staging/android/sync.h
Applying: staging/android: merge fix up for sync.h renaming
Merging char-misc/char-misc-next (e2402b1d214e nvmem: imx-ocotp: Fix assignment warning.)
Merging extcon/extcon-next (8a163be5d8cb extcon: Fix the wrong description about extcon_set/get_cable_state_())
Merging cgroup/for-next (1f22cd881c59 Merge branch 'for-4.7-fixes' into for-next)
Merging scsi/for-next (09aa8c2f3963 Merge branch 'misc' into for-next)
Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (c76004f3756d Merge branch 'for-4.8' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging pinctrl/for-next (69fc8ca00b5d Merge branch 'devel' into for-next)
Merging vhost/linux-next (139ab4d4e68b tools/virtio: add noring tool)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (c93c7c21fd2b Merge branch 'rproc-next' into for-next)
Merging gpio/for-next (c35285cb1570 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (8910a6a600ee pwm: lpss: pci: Enable PWM module on Intel Edison)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
Merging userns/for-next (aad82892af26 selinux: Add support for unprivileged mounts from user namespaces)
CONFLICT (content): Merge conflict in fs/proc/root.c
Applying: proc: fixup for "prevent stacking filesystems on top"
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (c3cabde5f1a8 Merge branch 'clk-notify' into clk-next)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (cde07f453bed selftests: media_tests - Add media_device_open to .gitignore)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (6436d4c1a83c x86/vdso: Fail the build if the vdso image has no dynamic section)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (5beb8787baef coresight: add PM runtime calls to coresight_simple_func())
Merging rtc/rtc-next (803bb30145df rtc: m48t86: move m48t86.h to platform_data)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (fbbabc209d80 Merge branch 'for-4.8/mm' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (36ac8116836c ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in mm/page_alloc.c
CONFLICT (content): Merge conflict in ipc/sem.c
CONFLICT (content): Merge conflict in arch/arm64/mm/dma-mapping.c
CONFLICT (modify/delete): arch/arm/configs/bcm_defconfig deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/arm/configs/bcm_defconfig left in tree.
$ git rm -f arch/arm/configs/bcm_defconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: drivers/fpga/Kconfig: fix build failure
Applying: tree-wide: replace config_enabled() with IS_ENABLED()
Applying: include/linux/bitmap.h: cleanup
Merging akpm/master (2e02c6ddb334 include/linux/bitmap.h: cleanup)
^ permalink raw reply
* Re: linux-next: manual merge of the powerpc tree with Linus' tree
From: Michael Ellerman @ 2016-06-29 6:33 UTC (permalink / raw)
To: Naveen N. Rao, Stephen Rothwell
Cc: Benjamin Herrenschmidt, linuxppc-dev, linux-next, linux-kernel,
Thadeu Lima de Souza Cascardo
In-Reply-To: <20160629052426.GB14508@naverao1-tp.localdomain>
On Wed, 2016-06-29 at 10:54 +0530, Naveen N. Rao wrote:
> On 2016/06/29 10:35AM, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the powerpc tree got a conflict in:
> >
> > arch/powerpc/Kconfig
> >
> > between commit:
> >
> > 844e3be47693 ("powerpc/bpf/jit: Disable classic BPF JIT on ppc64le")
>
> Ah, I see that the above commit is not part of powerpc next tree, which
> explains the conflict.
I'll probably merge the fixes branch into next at some point, so then it will
be sorted.
> > I fixed it up (see below - I am not sure this entirely correct) and can
That resolution is fine.
cheers
^ permalink raw reply
* Re: Re: linux-next: Tree for Jun 27 (pinctrl && !CONFIG_OF)
From: Alexander Stein @ 2016-06-29 5:54 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Randy Dunlap, Stephen Rothwell, linux-next, linux-kernel,
linux-gpio, devicetree@vger.kernel.org, Linus Torvalds,
Linus Walleij (linus.walleij@linaro.org)
In-Reply-To: <3990550.tEk9cGVQPW@wuerfel>
On Tuesday 28 June 2016, 10:37:52 wrote Arnd Bergmann:
> > > I think the commit should just be reverted, it clearly breaks
> > > stuff, and whatever needs it can be fixed in a better way.
> >
> > Why not depend PINCTRL_IPROC_GPIO on CONFIG_OF as Randy stated
> > pinconf_generic_dt_node_to_map_pin and friends are only present if
CONFIG_OF
> > is enabled. Depending on OF_GPIO only is enough under the assumption a)
you
> > made below.
> > Also what about providing dummy implementation for those missing function
in
> > case CONFIG_OF is disabled, my preference as more code can be compile
tested.
> >
> > > Specifically, we have three ways that the OF_GPIO symbol
> > > is used:
> > >
> > > a) it is implicitly enabled when both GPIOLIB and OF are turned on
> >
> > or if COMPILE_TEST is enabled
> >
> > I think a problem in this and possibly other cases is that COMPILE_TEST
> > loosens the Kconfig dependencies to some degree. How to proceed? Allow
compile
> > testing drivers only if some optional settings are enabled?
>
> I think we can start by reverting your patch: for compile-testing we can
> always enable CONFIG_OF these days, which will also turn on OF_GPIO.
My intention was to compile test (device tree) drivers also without CONFIG_OF
which is disabled by defconfig default on arch/x86/configs/*
> Compile-testing drivers that need OF_GPIO while OF is disabled makes
> no sense to me, it's not a configuration that anybody can ever use
> and it adds no build coverage.
That seems sensible. If we can agree that anyone who wants to compile test
drivers has to enable CONFIG_OF even it is not needed for the current
configuration.
Best regards,
Alexander
^ permalink raw reply
* Re: linux-next: manual merge of the kvm tree with the s390 tree
From: Heiko Carstens @ 2016-06-29 5:47 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Marcelo Tosatti, Gleb Natapov, kvm, Martin Schwidefsky,
linux-next, linux-kernel, Janosch Frank, Christian Borntraeger
In-Reply-To: <20160629143658.204b8d07@canb.auug.org.au>
On Wed, Jun 29, 2016 at 02:36:58PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/s390/hypfs/hypfs_diag.c
>
> between commit:
>
> e030c1125eab ("s390/hypfs: use basic block for diag inline assembly")
>
> from the s390 tree and commit:
>
> e65f30e0cb29 ("s390: hypfs: Move diag implementation and data definitions")
>
> from the kvm tree.
>
> I fixed it up (my fixup patch now looks like 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.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 14 Jun 2016 14:47:33 +1000
> Subject: [PATCH] s390: merge fix up for __diag204 move
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/s390/kernel/diag.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
The fix looks good. Thanks!
^ permalink raw reply
* Re: linux-next: manual merge of the powerpc tree with Linus' tree
From: Naveen N. Rao @ 2016-06-29 5:24 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michael Ellerman, Benjamin Herrenschmidt, linuxppc-dev,
linux-next, linux-kernel, Thadeu Lima de Souza Cascardo
In-Reply-To: <20160629103507.52c60714@canb.auug.org.au>
On 2016/06/29 10:35AM, Stephen Rothwell wrote:
> Hi all,
Hi Stephen,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/powerpc/Kconfig
>
> between commit:
>
> 844e3be47693 ("powerpc/bpf/jit: Disable classic BPF JIT on ppc64le")
Ah, I see that the above commit is not part of powerpc next tree, which
explains the conflict.
>
> from Linus' tree and commit:
>
> 156d0e290e96 ("powerpc/ebpf/jit: Implement JIT compiler for extended BPF")
>
> from the powerpc tree.
>
> I fixed it up (see below - I am not sure this entirely correct) and can
> carry the fix as necessary. This is now fixed as far as linux-next is
> concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging. You may
> also want to consider cooperating with the maintainer of the
> conflicting tree to minimise any particularly complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/powerpc/Kconfig
> index 0a9d439bcda6,ee82f9a09a85..000000000000
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@@ -128,7 -128,8 +128,8 @@@ config PP
> select IRQ_FORCED_THREADING
> select HAVE_RCU_TABLE_FREE if SMP
> select HAVE_SYSCALL_TRACEPOINTS
> - select HAVE_CBPF_JIT if CPU_BIG_ENDIAN
> - select HAVE_CBPF_JIT if !PPC64
> ++ select HAVE_CBPF_JIT if !PPC64 && CPU_BIG_ENDIAN
'if !PPC64' condition is sufficient, though having the BIG_ENDIAN check
should be ok too.
Thanks,
Naveen
> + select HAVE_EBPF_JIT if PPC64
> select HAVE_ARCH_JUMP_LABEL
> select ARCH_HAVE_NMI_SAFE_CMPXCHG
> select ARCH_HAS_GCOV_PROFILE_ALL
>
^ permalink raw reply
* linux-next: manual merge of the kvm tree with the s390 tree
From: Stephen Rothwell @ 2016-06-29 4:36 UTC (permalink / raw)
To: Marcelo Tosatti, Gleb Natapov, kvm, Martin Schwidefsky,
Heiko Carstens
Cc: linux-next, linux-kernel, Janosch Frank, Christian Borntraeger
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/s390/hypfs/hypfs_diag.c
between commit:
e030c1125eab ("s390/hypfs: use basic block for diag inline assembly")
from the s390 tree and commit:
e65f30e0cb29 ("s390: hypfs: Move diag implementation and data definitions")
from the kvm tree.
I fixed it up (my fixup patch now looks like 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.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 14 Jun 2016 14:47:33 +1000
Subject: [PATCH] s390: merge fix up for __diag204 move
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/s390/kernel/diag.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c
index a44faf4a0454..a97354c8c667 100644
--- a/arch/s390/kernel/diag.c
+++ b/arch/s390/kernel/diag.c
@@ -162,25 +162,27 @@ int diag14(unsigned long rx, unsigned long ry1, unsigned long subcode)
}
EXPORT_SYMBOL(diag14);
-static inline int __diag204(unsigned long subcode, unsigned long size, void *addr)
+static inline int __diag204(unsigned long *subcode, unsigned long size, void *addr)
{
- register unsigned long _subcode asm("0") = subcode;
+ register unsigned long _subcode asm("0") = *subcode;
register unsigned long _size asm("1") = size;
asm volatile(
" diag %2,%0,0x204\n"
- "0:\n"
+ "0: nopr %%r7\n"
EX_TABLE(0b,0b)
: "+d" (_subcode), "+d" (_size) : "d" (addr) : "memory");
- if (_subcode)
- return -1;
+ *subcode = _subcode;
return _size;
}
int diag204(unsigned long subcode, unsigned long size, void *addr)
{
diag_stat_inc(DIAG_STAT_X204);
- return __diag204(subcode, size, addr);
+ size = __diag204(&subcode, size, addr);
+ if (subcode)
+ return -1;
+ return size;
}
EXPORT_SYMBOL(diag204);
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: manual merge of the devicetree tree with the imx-mxs tree
From: Stephen Rothwell @ 2016-06-29 3:47 UTC (permalink / raw)
To: Rob Herring, Shawn Guo
Cc: linux-next, linux-kernel, Kefeng Wang, Alexander Shiyan
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/arm/mach-imx/mach-imx51.c
between commit:
463f90fa8a12 ("ARM: i.MX: Disable supervisor protect for i.MX51")
from the imx-mxs tree and commit:
850bea2335e4 ("arm: Remove unnecessary of_platform_populate with default match table")
from the devicetree tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/mach-imx/mach-imx51.c
index 0d9049825f0e,ec64de611d90..000000000000
--- a/arch/arm/mach-imx/mach-imx51.c
+++ b/arch/arm/mach-imx/mach-imx51.c
@@@ -52,10 -52,6 +52,8 @@@ static void __init imx51_dt_init(void
{
imx51_ipu_mipi_setup();
imx_src_init();
+
- of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-
+ imx_aips_allow_unprivileged_access("fsl,imx51-aipstz");
}
static void __init imx51_init_late(void)
^ permalink raw reply
* linux-next: manual merge of the powerpc tree with Linus' tree
From: Stephen Rothwell @ 2016-06-29 0:35 UTC (permalink / raw)
To: Michael Ellerman, Benjamin Herrenschmidt, linuxppc-dev
Cc: linux-next, linux-kernel, Naveen N. Rao,
Thadeu Lima de Souza Cascardo
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/Kconfig
between commit:
844e3be47693 ("powerpc/bpf/jit: Disable classic BPF JIT on ppc64le")
from Linus' tree and commit:
156d0e290e96 ("powerpc/ebpf/jit: Implement JIT compiler for extended BPF")
from the powerpc tree.
I fixed it up (see below - I am not sure this entirely correct) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/powerpc/Kconfig
index 0a9d439bcda6,ee82f9a09a85..000000000000
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -128,7 -128,8 +128,8 @@@ config PP
select IRQ_FORCED_THREADING
select HAVE_RCU_TABLE_FREE if SMP
select HAVE_SYSCALL_TRACEPOINTS
- select HAVE_CBPF_JIT if CPU_BIG_ENDIAN
- select HAVE_CBPF_JIT if !PPC64
++ select HAVE_CBPF_JIT if !PPC64 && CPU_BIG_ENDIAN
+ select HAVE_EBPF_JIT if PPC64
select HAVE_ARCH_JUMP_LABEL
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select ARCH_HAS_GCOV_PROFILE_ALL
^ permalink raw reply
* Re: [PATCH 2/2] ipc/sem: sem_lock with hysteresis
From: Davidlohr Bueso @ 2016-06-28 17:54 UTC (permalink / raw)
To: Manfred Spraul
Cc: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, Andrew Morton, LKML, linux-next, 1vier1, felixh
In-Reply-To: <fb23c7da-52a3-5e90-6c45-10e33d80417b@colorfullife.com>
On Sat, 25 Jun 2016, Manfred Spraul wrote:
>- Only simple ops: patch has no impact (the first 10 semops do not matter)
Agreed.
>- sleeping complex ops: patch has no impact, we are always in complex mode
>- not sleeping complex ops: depends on the size of the array.
>With a 4.000 semaphore array, I see an improvement of factor 20.
>
>There is obviously one case where the patch causes a slowdown:
>- complex op, then 11 simple ops, then repeat.
Yeah, you reset the counter to COMPLEX_MODE_ENTER every time we do a
complexmode_enter(), so if you have interleaving of complex and simple
ops you could end up always taking the big lock. This is my main concern
and not an unusual scenario at all.
I wonder if we could be a bit less aggressive if already in complex_mode
and do something like:
if (sma->complex_mode > 0) {
WRITE_ONCE(sma->complex_mode, min(complex_mode + 1, COMPLEX_MODE_ENTER));
return;
}
and still be constrained by COMPLEX_MODE_ENTER... of course that has its own
additional overhead, albeit less contention on the big lock :/
>
>Perhaps: set COMPLEX_MODE_ENTER to 1 or 2, then allow to configure it
>from user space.
Nah, I don't think it's a good idea to expose such internals to userspace.
>Or do not merge the patch and wait until someone come with a profile
>that shows complexmode_enter().
Testing/benchmarking this patch is on my todo list mainly because I'm lacking
a decent box to test it on. But I'm not conformable having this one without
any numbers for say at least a rdbms benchmark. I'm very eager to add the
first patch (complex_mode) once the nits are settled, as it fixes a real bug.
Thanks,
Davidlohr
^ permalink raw reply
* Re: [PATCH] drm/i915: fix build errors when ACPI is not enabled
From: Jani Nikula @ 2016-06-28 11:07 UTC (permalink / raw)
To: Chris Wilson
Cc: Randy Dunlap, LKML, linux-next@vger.kernel.org, Daniel Vetter,
intel-gfx, dri-devel, drm-intel-fixes
In-Reply-To: <20160628080604.GC25424@nuc-i3427.alporthouse.com>
On Tue, 28 Jun 2016, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Mon, Jun 27, 2016 at 02:53:19PM +0300, Jani Nikula wrote:
>> From: Randy Dunlap <rdunlap@infradead.org>
>>
>> Fix build errors when ACPI is not enabled by adding function stubs:
>>
>> ../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_suspend':
>> ../drivers/gpu/drm/i915/i915_drv.c:635:2: error: implicit declaration of function 'intel_opregion_unregister' [-Werror=implicit-function-declaration]
>> intel_opregion_unregister(dev_priv);
>> ../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_resume':
>> ../drivers/gpu/drm/i915/i915_drv.c:798:2: error: implicit declaration of function 'intel_opregion_register' [-Werror=implicit-function-declaration]
>> intel_opregion_register(dev_priv);
>>
>> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>> Cc: Daniel Vetter <daniel.vetter@intel.com>
>> Cc: Jani Nikula <jani.nikula@linux.intel.com>
>> Cc: intel-gfx@lists.freedesktop.org
>> Cc: dri-devel@lists.freedesktop.org
>> Fixes: 03d92e4779b8 ("drm/i915/opregion: Rename init/fini functions to register/unregister")
>> Cc: drm-intel-fixes@lists.freedesktop.org
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> [Jani: dropped the stale init/fini declarations]
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> -Chris
Pushed to drm-intel-next-queued, thanks for the patch and review.
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply
* next-20160628 build: 2 failures 4 warnings (next-20160628)
From: Build bot for Mark Brown @ 2016-06-28 9:36 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160628
Git describe: next-20160628
Commit: 6f2a161b14 Add linux-next specific files for 20160628
Build Time: 77 min 58 sec
Passed: 7 / 9 ( 77.78 %)
Failed: 2 / 9 ( 22.22 %)
Errors: 5
Warnings: 4
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
arm-allmodconfig
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : arm64-allmodconfig
3 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Errors summary: 5
2 ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
2 ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
2 ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
2 ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
2 ../drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
Warnings Summary: 4
1 ../include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
1 ../drivers/tty/serial/8250/8250_fintek.c:34:0: warning: "IRQ_MODE" redefined
1 ../arch/arm/mach-s3c64xx/common.h:28:2: warning: its scope is only this definition or declaration, which is probably not what you want
1 ../arch/arm/mach-s3c64xx/common.h:28:2: warning: 'struct device_node' declared inside parameter list
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 5 errors, 1 warnings, 0 section mismatches
Errors:
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
Warnings:
../include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 5 errors, 3 warnings, 0 section mismatches
Errors:
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
Warnings:
../arch/arm/mach-s3c64xx/common.h:28:2: warning: 'struct device_node' declared inside parameter list
../arch/arm/mach-s3c64xx/common.h:28:2: warning: its scope is only this definition or declaration, which is probably not what you want
../drivers/tty/serial/8250/8250_fintek.c:34:0: warning: "IRQ_MODE" redefined
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm64-defconfig
^ permalink raw reply
* Re: linux-next: Tree for Jun 27 (pinctrl && !CONFIG_OF)
From: Arnd Bergmann @ 2016-06-28 8:37 UTC (permalink / raw)
To: Alexander Stein
Cc: Randy Dunlap, Stephen Rothwell, linux-next, linux-kernel,
linux-gpio, devicetree@vger.kernel.org, Linus Torvalds,
Linus Walleij (linus.walleij@linaro.org)
In-Reply-To: <2044946.aGLaEK2W6I@ws-stein>
On Tuesday, June 28, 2016 9:00:47 AM CEST Alexander Stein wrote:
> On Monday 27 June 2016 23:36:29, Arnd Bergmann wrote:
> > On Monday, June 27, 2016 11:15:25 AM CEST Randy Dunlap wrote:
> > > On 06/26/16 23:39, Stephen Rothwell wrote:
> > > > Hi all,
> > >
> > > > Changes since 20160624:
> > > on i386, when CONFIG_OF is not enabled ...
> > > but OF_GPIO is enabled due to this in drivers/gpio/Kconfig:
> > >
> > > config OF_GPIO
> > >
> > > def_bool y
> > > depends on OF || COMPILE_TEST
> > >
> > > (above from commit 1e4a80640338924b9f9fd7a121ac31d08134410a
> > > from Alexander Stein <alexanders83@web.de>)
> > >
> > >
> > > ../drivers/pinctrl/bcm/pinctrl-iproc-gpio.c:381:20: error:
> > > 'pinconf_generic_dt_node_to_map_pin' undeclared here (not in a function)
> > > ../drivers/pinctrl/bcm/pinctrl-cygnus-mux.c:739:20: error:
> > > 'pinconf_generic_dt_node_to_map_group' undeclared here (not in a
> > > function) ../drivers/pinctrl/bcm/pinctrl-nsp-gpio.c:365:20: error:
> > > 'pinconf_generic_dt_node_to_map_pin' undeclared here (not in a function)
> > >
> > > because that function is only present when CONFIG_OF is enabled.
> > >
> > >
> > > Also, why does that commit (1e4a80640338924b9f9fd7a121ac31d08134410a)
> > > not have any other S-O-B lines in it? like whoever merged it?
> >
> > (adding Linus Walleij and Alexander Stein to Cc)
> >
> > Unfortunately, the changelog also doesn't say what triggered that
> > change. I guess there was a driver that did 'select OF_GPIO'
> > and had a dependency on COMPILE_TEST, though I don't see any
> > driver doing that in linux-next.
>
> It was the first change of the changes done in my branch
> https://github.com/AlexanderStein/linux/tree/gpio-compile-test
> in order to compile test as much gpio drivers as possible. Yet, pinctrl
> drivers were out of my scope.
I see
> > I think the commit should just be reverted, it clearly breaks
> > stuff, and whatever needs it can be fixed in a better way.
>
> Why not depend PINCTRL_IPROC_GPIO on CONFIG_OF as Randy stated
> pinconf_generic_dt_node_to_map_pin and friends are only present if CONFIG_OF
> is enabled. Depending on OF_GPIO only is enough under the assumption a) you
> made below.
> Also what about providing dummy implementation for those missing function in
> case CONFIG_OF is disabled, my preference as more code can be compile tested.
>
> > Specifically, we have three ways that the OF_GPIO symbol
> > is used:
> >
> > a) it is implicitly enabled when both GPIOLIB and OF are turned on
>
> or if COMPILE_TEST is enabled
>
> I think a problem in this and possibly other cases is that COMPILE_TEST
> loosens the Kconfig dependencies to some degree. How to proceed? Allow compile
> testing drivers only if some optional settings are enabled?
I think we can start by reverting your patch: for compile-testing we can
always enable CONFIG_OF these days, which will also turn on OF_GPIO.
Compile-testing drivers that need OF_GPIO while OF is disabled makes
no sense to me, it's not a configuration that anybody can ever use
and it adds no build coverage.
I think we should also drop all 'select OF_GPIO' statements, AFAICT
we have just proven that they are all redundant because they would
have otherwise broken things. This should be a separate cleanup patch.
Arnd
^ permalink raw reply
* Re: linux-next: Tree for Jun 27 (pinctrl && !CONFIG_OF)
From: Randy Dunlap @ 2016-06-28 8:25 UTC (permalink / raw)
To: Alexander Stein, Arnd Bergmann
Cc: Stephen Rothwell, linux-next, linux-kernel, linux-gpio,
devicetree@vger.kernel.org, Linus Torvalds,
Linus Walleij (linus.walleij@linaro.org)
In-Reply-To: <2044946.aGLaEK2W6I@ws-stein>
On 06/28/16 00:00, Alexander Stein wrote:
> On Monday 27 June 2016 23:36:29, Arnd Bergmann wrote:
>> On Monday, June 27, 2016 11:15:25 AM CEST Randy Dunlap wrote:
>>> On 06/26/16 23:39, Stephen Rothwell wrote:
>>>> Hi all,
>>>
>>>> Changes since 20160624:
>>> on i386, when CONFIG_OF is not enabled ...
>>> but OF_GPIO is enabled due to this in drivers/gpio/Kconfig:
>>>
>>> config OF_GPIO
>>>
>>> def_bool y
>>> depends on OF || COMPILE_TEST
>>>
>>> (above from commit 1e4a80640338924b9f9fd7a121ac31d08134410a
>>> from Alexander Stein <alexanders83@web.de>)
>>>
>>>
>>> ../drivers/pinctrl/bcm/pinctrl-iproc-gpio.c:381:20: error:
>>> 'pinconf_generic_dt_node_to_map_pin' undeclared here (not in a function)
>>> ../drivers/pinctrl/bcm/pinctrl-cygnus-mux.c:739:20: error:
>>> 'pinconf_generic_dt_node_to_map_group' undeclared here (not in a
>>> function) ../drivers/pinctrl/bcm/pinctrl-nsp-gpio.c:365:20: error:
>>> 'pinconf_generic_dt_node_to_map_pin' undeclared here (not in a function)
>>>
>>> because that function is only present when CONFIG_OF is enabled.
>>>
>>>
>>> Also, why does that commit (1e4a80640338924b9f9fd7a121ac31d08134410a)
>>> not have any other S-O-B lines in it? like whoever merged it?
>>
>> (adding Linus Walleij and Alexander Stein to Cc)
>>
>> Unfortunately, the changelog also doesn't say what triggered that
>> change. I guess there was a driver that did 'select OF_GPIO'
>> and had a dependency on COMPILE_TEST, though I don't see any
>> driver doing that in linux-next.
>
> It was the first change of the changes done in my branch
> https://github.com/AlexanderStein/linux/tree/gpio-compile-test
> in order to compile test as much gpio drivers as possible. Yet, pinctrl
> drivers were out of my scope.
>
>> I think the commit should just be reverted, it clearly breaks
>> stuff, and whatever needs it can be fixed in a better way.
>
> Why not depend PINCTRL_IPROC_GPIO on CONFIG_OF as Randy stated
> pinconf_generic_dt_node_to_map_pin and friends are only present if CONFIG_OF
> is enabled. Depending on OF_GPIO only is enough under the assumption a) you
> made below.
> Also what about providing dummy implementation for those missing function in
> case CONFIG_OF is disabled, my preference as more code can be compile tested.
IMO we shouldn't have to make function stubs just for COMPILE_TEST.
>> Specifically, we have three ways that the OF_GPIO symbol
>> is used:
>>
>> a) it is implicitly enabled when both GPIOLIB and OF are turned on
>
> or if COMPILE_TEST is enabled
>
> I think a problem in this and possibly other cases is that COMPILE_TEST
> loosens the Kconfig dependencies to some degree. How to proceed? Allow compile
> testing drivers only if some optional settings are enabled?
--
~Randy
^ permalink raw reply
* Re: [PATCH] drm/i915: fix build errors when ACPI is not enabled
From: Chris Wilson @ 2016-06-28 8:06 UTC (permalink / raw)
To: Jani Nikula
Cc: intel-gfx, Randy Dunlap, LKML, linux-next@vger.kernel.org,
drm-intel-fixes, dri-devel, Daniel Vetter
In-Reply-To: <1467028399-9965-1-git-send-email-jani.nikula@intel.com>
On Mon, Jun 27, 2016 at 02:53:19PM +0300, Jani Nikula wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
>
> Fix build errors when ACPI is not enabled by adding function stubs:
>
> ../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_suspend':
> ../drivers/gpu/drm/i915/i915_drv.c:635:2: error: implicit declaration of function 'intel_opregion_unregister' [-Werror=implicit-function-declaration]
> intel_opregion_unregister(dev_priv);
> ../drivers/gpu/drm/i915/i915_drv.c: In function 'i915_drm_resume':
> ../drivers/gpu/drm/i915/i915_drv.c:798:2: error: implicit declaration of function 'intel_opregion_register' [-Werror=implicit-function-declaration]
> intel_opregion_register(dev_priv);
>
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Fixes: 03d92e4779b8 ("drm/i915/opregion: Rename init/fini functions to register/unregister")
> Cc: drm-intel-fixes@lists.freedesktop.org
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> [Jani: dropped the stale init/fini declarations]
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply
* Re: linux-next: Tree for Jun 27 (pinctrl && !CONFIG_OF)
From: Alexander Stein @ 2016-06-28 7:00 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Randy Dunlap, Stephen Rothwell, linux-next, linux-kernel,
linux-gpio, devicetree@vger.kernel.org, Linus Torvalds,
Linus Walleij (linus.walleij@linaro.org)
In-Reply-To: <735717690.oeI6DkomRc@wuerfel>
On Monday 27 June 2016 23:36:29, Arnd Bergmann wrote:
> On Monday, June 27, 2016 11:15:25 AM CEST Randy Dunlap wrote:
> > On 06/26/16 23:39, Stephen Rothwell wrote:
> > > Hi all,
> >
> > > Changes since 20160624:
> > on i386, when CONFIG_OF is not enabled ...
> > but OF_GPIO is enabled due to this in drivers/gpio/Kconfig:
> >
> > config OF_GPIO
> >
> > def_bool y
> > depends on OF || COMPILE_TEST
> >
> > (above from commit 1e4a80640338924b9f9fd7a121ac31d08134410a
> > from Alexander Stein <alexanders83@web.de>)
> >
> >
> > ../drivers/pinctrl/bcm/pinctrl-iproc-gpio.c:381:20: error:
> > 'pinconf_generic_dt_node_to_map_pin' undeclared here (not in a function)
> > ../drivers/pinctrl/bcm/pinctrl-cygnus-mux.c:739:20: error:
> > 'pinconf_generic_dt_node_to_map_group' undeclared here (not in a
> > function) ../drivers/pinctrl/bcm/pinctrl-nsp-gpio.c:365:20: error:
> > 'pinconf_generic_dt_node_to_map_pin' undeclared here (not in a function)
> >
> > because that function is only present when CONFIG_OF is enabled.
> >
> >
> > Also, why does that commit (1e4a80640338924b9f9fd7a121ac31d08134410a)
> > not have any other S-O-B lines in it? like whoever merged it?
>
> (adding Linus Walleij and Alexander Stein to Cc)
>
> Unfortunately, the changelog also doesn't say what triggered that
> change. I guess there was a driver that did 'select OF_GPIO'
> and had a dependency on COMPILE_TEST, though I don't see any
> driver doing that in linux-next.
It was the first change of the changes done in my branch
https://github.com/AlexanderStein/linux/tree/gpio-compile-test
in order to compile test as much gpio drivers as possible. Yet, pinctrl
drivers were out of my scope.
> I think the commit should just be reverted, it clearly breaks
> stuff, and whatever needs it can be fixed in a better way.
Why not depend PINCTRL_IPROC_GPIO on CONFIG_OF as Randy stated
pinconf_generic_dt_node_to_map_pin and friends are only present if CONFIG_OF
is enabled. Depending on OF_GPIO only is enough under the assumption a) you
made below.
Also what about providing dummy implementation for those missing function in
case CONFIG_OF is disabled, my preference as more code can be compile tested.
> Specifically, we have three ways that the OF_GPIO symbol
> is used:
>
> a) it is implicitly enabled when both GPIOLIB and OF are turned on
or if COMPILE_TEST is enabled
I think a problem in this and possibly other cases is that COMPILE_TEST
loosens the Kconfig dependencies to some degree. How to proceed? Allow compile
testing drivers only if some optional settings are enabled?
Best regards,
Alexander
^ permalink raw reply
* linux-next: Tree for Jun 28
From: Stephen Rothwell @ 2016-06-28 6:09 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160627:
New tree: binfmt_misc
The nfs tree lost its build failure.
The net-next tree gained a conflict against the imx-mxs tree.
The iommu tree gained a conflict against the arm tree.
The audit tree gained a conflict against the security tree.
Non-merge commits (relative to Linus' tree): 5768
5493 files changed, 250544 insertions(+), 108844 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 235 trees (counting Linus' and 34 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (3992a272a72c Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild)
Merging fixes/master (5edb56491d48 Linux 4.7-rc3)
Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables)
Merging arc-current/for-curr (5edb56491d48 Linux 4.7-rc3)
Merging arm-current/fixes (56530f5d2ddc ARM: 8579/1: mm: Fix definition of pmd_mknotpresent)
Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (844e3be47693 powerpc/bpf/jit: Disable classic BPF JIT on ppc64le)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (4192f672fae5 vsock: make listener child lock ordering explicit)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (370a8107e788 ipvs: fix bind to link-local mcast IPv6 address in backup)
Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git)
Merging mac80211/master (3d5fdff46c4b wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel)
Merging sound-current/for-linus (d5dbbe656948 ALSA: dummy: Fix a use-after-free at closing)
Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code)
Merging driver-core.current/driver-core-linus (33688abb2802 Linux 4.7-rc4)
Merging tty.current/tty-linus (5353ed8deede devpts: fix null pointer dereference on failed memory allocation)
Merging usb.current/usb-linus (ab2a4bf83902 USB: don't free bandwidth_mutex too early)
Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command)
Merging usb-serial-fixes/usb-linus (33688abb2802 Linux 4.7-rc4)
Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm)
Merging staging.current/staging-linus (df013212a1b6 Merge tag 'iio-fixes-for-4.7b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (33688abb2802 Linux 4.7-rc4)
Merging input-current/for-linus (60842ef8128e Input: vmmouse - remove port reservation)
Merging crypto-current/master (055ddaace035 crypto: user - re-add size check for CRYPTO_MSG_GETALG)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read)
Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (59461c018204 mfd: max77620: Fix FPS switch statements)
Merging drm-intel-fixes/for-linux-next-fixes (4c2e07c6a29e Linux 4.7-rc5)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (5edb56491d48 Linux 4.7-rc3)
Merging arm/for-next (f07617e99523 Merge branches 'component', 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (fcfe0c8bf1fc ARM: SoC: Document merges)
Merging amlogic/for-next (cc989c0bfd53 Merge remote-tracking branch 'clk/clk-s905' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (aa5c0a1e15c2 Merge branch anholt/bcm2835-dt-64-next into for-next)
Merging berlin/berlin/for-next (1a695a905c18 Linux 4.7-rc1)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (b2f6951491c7 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (eef6bb9fc17a Merge branch 'for_4.8/keystone' into next)
Merging mvebu/for-next (56454a34f5d6 Merge branch 'mvebu/defconfig64' into mvebu/for-next)
Merging omap/for-next (a68816dc4006 Merge branch 'omap-for-v4.8/soc' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (3b6d0be3e426 Merge tag 'qcom-dt-for-4.8' into all-for-4.8)
Merging renesas/next (334566aa6787 Merge branches 'heads/arm64-defconfig-for-v4.8', 'heads/arm64-dt-for-v4.8', 'heads/defconfig-for-v4.8', 'heads/dt-for-v4.8' and 'heads/soc-for-v4.8' into next)
Merging rockchip/for-next (339c7e214a46 Merge branch 'v4.8-armsoc/dts32' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (c310bccb348a Merge branch 'next/defconfig' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi
Merging tegra/for-next (5bcc7efc04c3 Merge branch for-4.8/arm64 into for-next)
Merging arm64/for-next/core (9fdc14c55cd6 arm64: mm: fix location of _etext)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (70f4f9352317 ia64: efi: use timespec64 for persistent clock)
Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging m68knommu/for-next (33688abb2802 Linux 4.7-rc4)
Merging metag/for-next (592ddeeff8cb metag: Fix typos)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (847e858f3d0e SSB: Change bare unsigned to unsigned int to suit coding style)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging powerpc/next (9497a1c1c5b4 powerpc/powernv: Print correct PHB type names)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (63bf903583d7 Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL")
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (893d66192c46 tile: support gcc 7 optimization to use __multi3)
Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7)
Merging btrfs-kdave/for-next (5027553b087e Merge branch 'for-next-next-4.7-20160623' into for-next-20160623)
Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache)
Merging cifs/for-next (fbe601f7a34b Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (40f0fd372a62 ecryptfs: fix spelling mistakes)
Merging ext3/for_next (e008bb6134a6 quota: use time64_t internally)
Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO)
Merging f2fs/dev (a2481adac819 f2fs: avoid latency-critical readahead of node pages)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (507c552aa58f fuse: improve aio directIO write performance for size extending writes)
Merging gfs2/for-next (fd4c5748b8d3 gfs2: writeout truncated pages)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (589a626cccd4 Merge branch 'writeback')
Merging nfsd/nfsd-next (ee8f2a36a99c nfsd: allow nfsd to advertise multiple layout types)
Merging orangefs/for-next (2dcd0af568b0 Linux 4.6)
Merging overlayfs/overlayfs-next (f920c41f047a ovl: move some common code in a function)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4ac1c17b2044 UBIFS: Implement ->migratepage())
Merging xfs/for-next (f477cedc4e79 Merge branch 'xfs-4.8-misc-fixes-2' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (1eb82bc8e712 Merge branch 'for-linus' into for-next)
Merging pci/next (e0af5a975e77 Merge branch 'pci/resource' into next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging pstore/for-next/pstore (35da60941e44 pstore/ram: add Device Tree bindings)
Merging hid/for-next (68925197c96e Merge branch 'for-4.7/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (d86a4c24d68e Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (18c358ac5e32 Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (d4db8217f4b7 hwmon: (dell-smm) In debug mode log duration of SMM calls)
CONFLICT (content): Merge conflict in drivers/hwmon/dell-smm-hwmon.c
Merging v4l-dvb/master (2ed52999aaf3 Merge branch 'patchwork' into to_next)
Merging pm/linux-next (7bf7871fa172 Merge branches 'pm-domains', 'pm-sleep' and 'pm-clk' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (2c5ce98e1e83 thermal: sysfs: add comments describing locking strategy)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
CONFLICT (add/add): Merge conflict in drivers/thermal/tango_thermal.c
CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (73a14400c949 Merge branch 'topic/xilinx' into next)
Merging net-next/master (de2fbe7ae363 Merge branch 'sfp-infra')
CONFLICT (content): Merge conflict in tools/virtio/ringtest/Makefile
CONFLICT (content): Merge conflict in net/sched/sch_netem.c
CONFLICT (content): Merge conflict in net/rds/tcp_listen.c
CONFLICT (content): Merge conflict in net/rds/tcp_connect.c
CONFLICT (content): Merge conflict in drivers/net/vrf.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/qlogic/qed/qed_hsi.h
CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec.h
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2-svk.dts
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (625b44fc15f8 ipvs: count pre-established TCP states as active)
Merging wireless-drivers-next/master (1bb57c8a5e33 Merge ath-next from ath.git)
Merging bluetooth/master (92890252babd ieee802154: allow netns create of lowpan interface)
Merging mac80211-next/master (e69f73bfecb0 Merge branch 'remove-qdisc-throttle')
Merging rdma/for-next (fb92d8fb1b9c Merge branches 'cxgb4-4.8', 'mlx5-4.8' and 'fw-version' into k.o/for-4.8)
Merging rdma-leon/rdma-next (33688abb2802 Linux 4.7-rc4)
Merging rdma-leon-test/testing/rdma-next (33688abb2802 Linux 4.7-rc4)
Merging mtd/master (becc7ae544c6 MAINTAINERS: Add file patterns for mtd device tree bindings)
Merging l2-mtd/master (95193796256c mtd: m25p80: read in spi_max_transfer_size chunks)
Merging nand/nand/next (f5f2894f18af mtd: nand: sunxi: add reset line support)
Merging crypto/master (61dc0a446e5d hwrng: omap - Fix assumption that runtime_get_sync will always succeed)
Merging drm/drm-next (2a3467063ae3 Merge tag 'mediatek-drm-2016-06-20' of git://git.pengutronix.de/git/pza/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/sun4i/sun4i_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/sti/sti_drv.c
Merging drm-panel/drm/panel/for-next (f103b93d90c2 drm/dsi: Add uevent callback)
Merging drm-intel/for-linux-next (4aa7fb9c3c4f drm/i915/dmc: Step away from symbolic links)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbc.c
Merging drm-tegra/drm/tegra/for-next (575a892adaf7 gpu: host1x: Remove useless local variable)
Merging drm-misc/topic/drm-misc (c78d1ca2d2e3 drm: fix some spelling mistakes)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops)
Merging hdlcd/for-upstream/hdlcd (f6c68b4bd4a9 drm: hdlcd: Add information about the underlying framebuffers in debugfs)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (b7e7559f439c Merge branches 'sunxi/clk-fixes-for-4.7', 'sunxi/dt-for-4.8' and 'sunxi/fixes-for-4.7' into sunxi/for-next)
Merging kbuild/for-next (7e01dad0469b Merge branch 'kbuild/kbuild' into kbuild/for-next)
Applying: gcc-plugins: disable under COMPILE_TEST
Merging kspp/for-next/kspp (20f0992c935f latent_entropy: Add the extra_latent_entropy kernel parameter)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (e568f95409ca Merge remote-tracking branches 'regmap/topic/i2c', 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next)
Merging sound/for-next (3915bf294652 ALSA: seq_timer: use monotonic times internally)
Merging sound-asoc/for-next (5664c75bd47e Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc-next)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (fcd6eb50eadd Input: add powerkey driver for HISI 65xx SoC)
Merging block/for-next (3cee5575153a Merge branch 'for-4.8/core' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in fs/btrfs/compression.c
CONFLICT (content): Merge conflict in block/blk-lib.c
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (0fe0a864be7f Merge branch 'dm-4.7' into for-next)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (466780648db4 mmc: sh_mmcif: Use a 10s timeout in the error recovery path)
Merging md/for-next (d787be4092e2 md: reduce the number of synchronize_rcu() calls when multiple devices fail.)
CONFLICT (content): Merge conflict in drivers/md/raid10.c
CONFLICT (content): Merge conflict in drivers/md/raid1.c
Merging mfd/for-mfd-next (1cf9326d4c07 mfd: max14577: Allow driver to be built as a module)
Merging backlight/for-backlight-next (4db8c9572ce1 backlight: lp855x: Add enable regulator)
Merging battery/master (2e05b518c897 power_supply: bq27xxx_battery: Group register mappings into one table)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (fae9c48a23cf Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/qcom-spmi', 'regulator/topic/tps65218' and 'regulator/topic/twl' into regulator-next)
Merging security/next (f786b7520982 tpm_crb: fix address space of the return pointer in crb_map_res())
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging integrity/next (848b134bf8e7 ima: extend the measurement entry specific pcr)
Merging keys/keys-next (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3f09354ac84c netlabel: Implement CALIPSO config functions for SMACK.)
Merging tpmdd/next (f786b7520982 tpm_crb: fix address space of the return pointer in crb_map_res())
Merging watchdog/master (1a695a905c18 Linux 4.7-rc1)
Merging iommu/next (e45a4c9d4041 Merge branches 'iommu/fixes', 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek' and 'arm/msm' into next)
CONFLICT (content): Merge conflict in drivers/iommu/mtk_iommu.c
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (9698cbf0bea6 vfio: platform: support No-IOMMU mode)
Merging jc_docs/docs-next (17defc282fe6 Documentation: add meta-documentation for Sphinx and kernel-doc)
CONFLICT (content): Merge conflict in Documentation/index.rst
Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
Merging audit/next (86b2efbe3a39 audit: add fields to exclude filter by reusing user filter)
CONFLICT (content): Merge conflict in arch/s390/kernel/ptrace.c
Merging devicetree/for-next (15cc2ed6dcf9 of/irq: Mark initialised interrupt controllers as populated)
CONFLICT (content): Merge conflict in arch/arm/mach-bcm/board_bcm21664.c
Merging mailbox/mailbox-for-next (9ac3e85a5c5c mailbox: pl320: remove __raw IO)
Merging spi/for-next (e4f12a3ff936 Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/rockchip', 'spi/topic/sh-msiof', 'spi/topic/sunxi' and 'spi/topic/ti-qspi' into spi-next)
Merging tip/auto-latest (907012b1ab02 Merge branch 'x86/platform')
Merging clockevents/clockevents/next (3d802c5c8cfa Merge branches 'clockevents/clksrc-of-ret' and 'clockevents/compile-test' into clockevents/next)
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (a67adb32d941 ARM: dts: Add Arria10 Ethernet EDAC devicetree entry)
Merging irqchip/irqchip/for-next (77d50b17c990 Merge branch 'irqchip/misc' into irqchip/for-next)
Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID)
Merging rcu/rcu/next (35a4495f637e rcu: Consolidate expedited grace period machinery)
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Applying: rcu: merge fix for kernel/rcu/tree_exp.h
Merging kvm/linux-next (8ff7b956471f Merge tag 'kvm-s390-next-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c
Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c
Applying: s390: merge fix up for __diag204 move
Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (fd7bacbca47a KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c
Merging kvms390/next (a411edf1320e KVM: s390: vsie: add module parameter "nested")
Merging xen-tip/linux-next (bdadcaf2a7c1 xen: remove incorrect forward declaration)
Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction)
Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads)
Merging drivers-x86/for-next (ab9bb11ccbaa dell-wmi: Add a WMI event code for display on/off)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (9c99e5e51988 HSI: omap_ssi: drop pm_runtime_irq_safe)
Merging leds/for-next (b1ae40a5db61 leds: Only descend into leds directory when CONFIG_NEW_LEDS is set)
Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init)
Merging driver-core/driver-core-next (33688abb2802 Linux 4.7-rc4)
Merging tty/tty-next (98f2082c3ac4 tty/serial: atmel: enforce tasklet init and termination sequences)
Merging usb/usb-next (aa5e94a2e133 Revert "usb: ohci-at91: Forcibly suspend ports while USB suspend")
Merging usb-gadget/next (1d23d16a88e6 usb: gadget: pch_udc: reorder spin_[un]lock to avoid deadlock)
Merging usb-serial/usb-next (33688abb2802 Linux 4.7-rc4)
Merging usb-chipidea-next/ci-for-usb-next (ebfad91c5da3 dt-bindings: ci-hdrc-usb2: s/gadget-itc-setting/itc-setting in example)
Merging staging/staging-next (b3e6916d6edf staging: wilc1000: fix return value check in wlan_initialize_threads())
CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/lloop.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/llite/lloop.c left in tree.
CONFLICT (modify/delete): drivers/staging/android/sync.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/android/sync.h left in tree.
$ git rm -f drivers/staging/lustre/lustre/llite/lloop.c drivers/staging/android/sync.h
Applying: staging/android: merge fix up for sync.h renaming
Merging char-misc/char-misc-next (e2402b1d214e nvmem: imx-ocotp: Fix assignment warning.)
Merging extcon/extcon-next (8a163be5d8cb extcon: Fix the wrong description about extcon_set/get_cable_state_())
Merging cgroup/for-next (1f22cd881c59 Merge branch 'for-4.7-fixes' into for-next)
Merging scsi/for-next (09aa8c2f3963 Merge branch 'misc' into for-next)
Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (da780c64d2b6 Merge branch 'for-4.7-fixes' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging pinctrl/for-next (69fc8ca00b5d Merge branch 'devel' into for-next)
Merging vhost/linux-next (139ab4d4e68b tools/virtio: add noring tool)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (980db2a1878b Merge branch 'rproc-next' into for-next)
Merging gpio/for-next (c35285cb1570 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (8910a6a600ee pwm: lpss: pci: Enable PWM module on Intel Edison)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
Merging userns/for-next (aad82892af26 selinux: Add support for unprivileged mounts from user namespaces)
CONFLICT (content): Merge conflict in fs/proc/root.c
Applying: proc: fixup for "prevent stacking filesystems on top"
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (367b30502d07 Merge remote-tracking branch 'clk/clk-s905' into clk-next)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (cde07f453bed selftests: media_tests - Add media_device_open to .gitignore)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (6436d4c1a83c x86/vdso: Fail the build if the vdso image has no dynamic section)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (5beb8787baef coresight: add PM runtime calls to coresight_simple_func())
Merging rtc/rtc-next (803bb30145df rtc: m48t86: move m48t86.h to platform_data)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (fbbabc209d80 Merge branch 'for-4.8/mm' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (36ac8116836c ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in mm/page_alloc.c
CONFLICT (content): Merge conflict in ipc/sem.c
CONFLICT (content): Merge conflict in arch/arm64/mm/dma-mapping.c
CONFLICT (modify/delete): arch/arm/configs/bcm_defconfig deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/arm/configs/bcm_defconfig left in tree.
$ git rm -f arch/arm/configs/bcm_defconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: drivers/fpga/Kconfig: fix build failure
Applying: tree-wide: replace config_enabled() with IS_ENABLED()
Applying: include/linux/bitmap.h: cleanup
Merging akpm/master (f3376524025c include/linux/bitmap.h: cleanup)
^ permalink raw reply
* Re: [PATCH 1/2] ipc/sem.c: Fix complex_count vs. simple op race
From: Davidlohr Bueso @ 2016-06-28 5:27 UTC (permalink / raw)
To: Manfred Spraul
Cc: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, Andrew Morton, LKML, linux-next, 1vier1, felixh,
stable
In-Reply-To: <b5b4e032-8b1c-f102-ac23-3b331c2ed615@colorfullife.com>
On Thu, 23 Jun 2016, Manfred Spraul wrote:
>What I'm not sure yet is if smp_load_acquire() is sufficient:
>
>Thread A:
>> if (!READ_ONCE(sma->complex_mode)) {
>The code is test_and_test, no barrier requirements for first test
Yeah, it would just make us take the big lock unnecessarily, nothing fatal
and I agree its probably worth the optimization. It still might be worth
commenting.
>> /*
>> * It appears that no complex operation is around.
>> * Acquire the per-semaphore lock.
>> */
>> spin_lock(&sem->lock);
>>
>> if (!smp_load_acquire(&sma->complex_mode)) {
>> /* fast path successful! */
>> return sops->sem_num;
>> }
>> spin_unlock(&sem->lock);
>> }
>
>Thread B:
>> WRITE_ONCE(sma->complex_mode, true);
>>
>> /* We need a full barrier:
>> * The write to complex_mode must be visible
>> * before we read the first sem->lock spinlock state.
>> */
>> smp_mb();
>>
>> for (i = 0; i < sma->sem_nsems; i++) {
>> sem = sma->sem_base + i;
>> spin_unlock_wait(&sem->lock);
>> }
>
>If thread A is allowed to issue read_spinlock;read complex_mode;write
>spinlock, then thread B would not notice that thread A is in the
>critical section
Are you referring to the sem->lock word not being visibly locked before we
read complex_mode (for the second time)? This issue was fixed in 2c610022711
(locking/qspinlock: Fix spin_unlock_wait() some more). So smp_load_acquire
should be enough afaict, or are you referring to something else?
Thanks,
Davidlohr
^ permalink raw reply
* linux-next: manual merge of the audit tree with the security tree
From: Stephen Rothwell @ 2016-06-28 3:24 UTC (permalink / raw)
To: Paul Moore, James Morris; +Cc: linux-next, linux-kernel, Kees Cook
Hi Paul,
Today's linux-next merge of the audit tree got conflicts in:
arch/s390/kernel/ptrace.c
between commit:
0208b9445bc0 ("s390/ptrace: run seccomp after ptrace")
from the security tree and commit:
da7f750c1ef5 ("s390: ensure that syscall arguments are properly masked on s390")
from the audit tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/s390/kernel/ptrace.c
index cea17010448f,defc0dca4510..000000000000
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@@ -821,6 -821,16 +821,8 @@@ long compat_arch_ptrace(struct task_str
asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
{
- long ret = 0;
+ unsigned long mask = -1UL;
+
- /* Do the secure computing check first. */
- if (secure_computing()) {
- /* seccomp failures shouldn't expose any additional code. */
- ret = -1;
- goto out;
- }
-
/*
* The sysc_tracesys code in entry.S stored the system
* call number to gprs[2].
@@@ -846,11 -850,14 +848,14 @@@
if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
trace_sys_enter(regs, regs->gprs[2]);
- audit_syscall_entry(regs->gprs[2], regs->orig_gpr2,
- regs->gprs[3], regs->gprs[4],
- regs->gprs[5]);
+ if (is_compat_task())
+ mask = 0xffffffff;
+
+ audit_syscall_entry(regs->gprs[2], regs->orig_gpr2 & mask,
+ regs->gprs[3] & mask, regs->gprs[4] & mask,
+ regs->gprs[5] & mask);
-out:
- return ret ?: regs->gprs[2];
+
+ return regs->gprs[2];
}
asmlinkage void do_syscall_trace_exit(struct pt_regs *regs)
^ permalink raw reply
* linux-next: manual merge of the iommu tree with the arm tree
From: Stephen Rothwell @ 2016-06-28 3:13 UTC (permalink / raw)
To: Joerg Roedel, Russell King; +Cc: linux-next, linux-kernel, Honghui Zhang
Hi Joerg,
Today's linux-next merge of the iommu tree got a conflict in:
drivers/iommu/mtk_iommu.c
between commit:
d267804c8457 ("iommu: convert DT component matching to component_match_add_release()")
from the arm tree and commit:
9ca340c98c0d ("iommu/mediatek: move the common struct into header file")
from the iommu tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/iommu/mtk_iommu.c
index c036df1c49ca,b12c12d74c33..000000000000
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@@ -552,30 -524,6 +524,11 @@@ static int mtk_iommu_hw_init(const stru
return 0;
}
- static int compare_of(struct device *dev, void *data)
- {
- return dev->of_node == data;
- }
-
+static void release_of(struct device *dev, void *data)
+{
+ of_node_put(data);
+}
+
- static int mtk_iommu_bind(struct device *dev)
- {
- struct mtk_iommu_data *data = dev_get_drvdata(dev);
-
- return component_bind_all(dev, &data->smi_imu);
- }
-
- static void mtk_iommu_unbind(struct device *dev)
- {
- struct mtk_iommu_data *data = dev_get_drvdata(dev);
-
- component_unbind_all(dev, &data->smi_imu);
- }
-
static const struct component_master_ops mtk_iommu_com_ops = {
.bind = mtk_iommu_bind,
.unbind = mtk_iommu_unbind,
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the imx-mxs tree
From: Stephen Rothwell @ 2016-06-28 1:27 UTC (permalink / raw)
To: David Miller, netdev, Shawn Guo
Cc: linux-next, linux-kernel, Lucas Stach, Fugang Duan
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/freescale/fec.h
between commit:
293809055656 ("ARM: imx6: disable deeper idle states when FEC is active w/o HW workaround")
from the imx-mxs tree and commit:
ff7566b8d71f ("net: fec: add interrupt coalesc quirk flag")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/ethernet/freescale/fec.h
index dc71a88e9c55,92fd5c0bf4df..000000000000
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@@ -442,8 -442,8 +442,10 @@@ struct bufdesc_ex
#define FEC_QUIRK_SINGLE_MDIO (1 << 11)
/* Controller supports RACC register */
#define FEC_QUIRK_HAS_RACC (1 << 12)
+/* Interrupt doesn't wake CPU from deep idle */
+#define FEC_QUIRK_ERR006687 (1 << 13)
+ /* Controller supports interrupt coalesc */
-#define FEC_QUIRK_HAS_COALESCE (1 << 13)
++#define FEC_QUIRK_HAS_COALESCE (1 << 14)
struct bufdesc_prop {
int qid;
^ permalink raw reply
* Re: Can you add the binfmt_misc tree to linux-next?
From: James Bottomley @ 2016-06-27 23:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-fsdevel, Linux Containers, linux-next
In-Reply-To: <20160628092914.7ab1b37e@canb.auug.org.au>
On Tue, 2016-06-28 at 09:29 +1000, Stephen Rothwell wrote:
> Hi James,
>
> On Mon, 27 Jun 2016 09:16:38 -0700 James Bottomley <
> James.Bottomley@HansenPartnership.com> wrote:
> >
> > Since I'd effectively become binfmt_misc maintainer when these
> > patches get merged on the last person to touch it owns it
> > principle, it makes sense to begin now more formally. The tree is
> > at
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git
> > for-next
> >
> > It currently contains four patches adding the container emulation
> > infrastructure from the persistent-handlers branch.
>
> Added from today. I only found 3 patches, though:
>
> 4af75df6a410 binfmt_misc: add F option description to documentation
> 948b701a607f binfmt_misc: add persistent opened binary handler for
> containers
> 9a08c352d053 fs: add filp_clone_open API
Yes, that's right, sorry, I can't count.
> Thanks for adding your subsystem tree as a participant of linux-next.
> As you may know, this is not a judgement of your code. The purpose
> of linux-next is for integration testing and to lower the impact of
> conflicts between subsystems in the next merge window.
>
> 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.
Thanks,
James
^ permalink raw reply
* Re: Can you add the binfmt_misc tree to linux-next?
From: Stephen Rothwell @ 2016-06-27 23:29 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-next, linux-fsdevel, Linux Containers
In-Reply-To: <1467044198.2264.19.camel@HansenPartnership.com>
Hi James,
On Mon, 27 Jun 2016 09:16:38 -0700 James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
>
> Since I'd effectively become binfmt_misc maintainer when these patches
> get merged on the last person to touch it owns it principle, it makes
> sense to begin now more formally. The tree is at
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git for-next
>
> It currently contains four patches adding the container emulation
> infrastructure from the persistent-handlers branch.
Added from today. I only found 3 patches, though:
4af75df6a410 binfmt_misc: add F option description to documentation
948b701a607f binfmt_misc: add persistent opened binary handler for containers
9a08c352d053 fs: add filp_clone_open API
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgement of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
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.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
^ 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