* Re: linux-next: build warning after merge of the tty tree
From: Stephen Rothwell @ 2017-02-07 11:18 UTC (permalink / raw)
To: Greg KH
Cc: Ulrich Hecht, linux-next, linux-kernel@vger.kernel.org,
Geert Uytterhoeven
In-Reply-To: <20170207083731.GA20338@kroah.com>
Hi Greg,
On Tue, 7 Feb 2017 09:37:31 +0100 Greg KH <greg@kroah.com> wrote:
>
> On Tue, Feb 07, 2017 at 09:37:09AM +1100, Stephen Rothwell wrote:
> >
> > I don't see that commit in any tree I have fetched.
>
> That is correct, it's in my "testing" branch that I use to stage things
> in before it gets sent to the branch that you pull from.
What an amusing idea ;-)
> That branch is now merged with my -next branch, so you will see this
> change the next time you sync.
Thanks.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the akpm tree with the net-next tree
From: Stephen Rothwell @ 2017-02-07 9:45 UTC (permalink / raw)
To: Marc Kleine-Budde
Cc: Andrew Morton, David Miller, Networking, linux-next, linux-kernel,
Masahiro Yamada
In-Reply-To: <4cbbbce4-1318-9a75-d918-5b209cc418e6@pengutronix.de>
Hi Marc,
On Tue, 7 Feb 2017 09:40:09 +0100 Marc Kleine-Budde <mkl@pengutronix.de> wrote:
>
> On 02/07/2017 06:23 AM, Stephen Rothwell wrote:
> > diff --cc drivers/net/can/flexcan.c
> > index ea57fed375c6,4dc71bce525c..000000000000
> > --- a/drivers/net/can/flexcan.c
> > +++ b/drivers/net/can/flexcan.c
> > @@@ -195,9 -189,7 +195,9 @@@
> > */
> > #define FLEXCAN_QUIRK_BROKEN_ERR_STATE BIT(1) /* [TR]WRN_INT not connected */
> > #define FLEXCAN_QUIRK_DISABLE_RXFG BIT(2) /* Disable RX FIFO Global mask */
> > -#define FLEXCAN_QUIRK_DISABLE_MECR BIT(3) /* Disable Memory error detection */
> > +#define FLEXCAN_QUIRK_ENABLE_EACEN_RRS BIT(3) /* Enable EACEN and RRS bit in ctrl2 */
> > - #define FLEXCAN_QUIRK_DISABLE_MECR BIT(4) /* Disble Memory error detection */
> > ++#define FLEXCAN_QUIRK_DISABLE_MECR BIT(4) /* Disbale Memory error detection */
>
> ^^^^^^^
> Should be "Disable". I'll send David Miller a fix for the typo.
The "Disbale" typo is only in my merge resolution :-( I will fix it there.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the akpm tree with the net-next tree
From: Marc Kleine-Budde @ 2017-02-07 8:40 UTC (permalink / raw)
To: Stephen Rothwell, Andrew Morton, David Miller, Networking
Cc: linux-next, linux-kernel, Masahiro Yamada
In-Reply-To: <20170207162322.3732a5a1@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 2177 bytes --]
On 02/07/2017 06:23 AM, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> drivers/net/can/flexcan.c
>
> between commits:
>
> 9eb7aa891101 ("can: flexcan: add quirk FLEXCAN_QUIRK_ENABLE_EACEN_RRS")
> b3cf53e988ce ("can: flexcan: add support for timestamp based rx-offload")
>
> from the net-next tree and commit:
>
> "scripts/spelling.txt: add "disble(d)" pattern and fix typo instances"
>
> from the akpm 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.
>
> diff --cc drivers/net/can/flexcan.c
> index ea57fed375c6,4dc71bce525c..000000000000
> --- a/drivers/net/can/flexcan.c
> +++ b/drivers/net/can/flexcan.c
> @@@ -195,9 -189,7 +195,9 @@@
> */
> #define FLEXCAN_QUIRK_BROKEN_ERR_STATE BIT(1) /* [TR]WRN_INT not connected */
> #define FLEXCAN_QUIRK_DISABLE_RXFG BIT(2) /* Disable RX FIFO Global mask */
> -#define FLEXCAN_QUIRK_DISABLE_MECR BIT(3) /* Disable Memory error detection */
> +#define FLEXCAN_QUIRK_ENABLE_EACEN_RRS BIT(3) /* Enable EACEN and RRS bit in ctrl2 */
> - #define FLEXCAN_QUIRK_DISABLE_MECR BIT(4) /* Disble Memory error detection */
> ++#define FLEXCAN_QUIRK_DISABLE_MECR BIT(4) /* Disbale Memory error detection */
^^^^^^^
Should be "Disable". I'll send David Miller a fix for the typo.
> +#define FLEXCAN_QUIRK_USE_OFF_TIMESTAMP BIT(5) /* Use timestamp based offloading */
>
> /* Structure of the message buffer */
> struct flexcan_mb {
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* Re: linux-next: build warning after merge of the tty tree
From: Greg KH @ 2017-02-07 8:37 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Ulrich Hecht, linux-next, linux-kernel@vger.kernel.org,
Geert Uytterhoeven
In-Reply-To: <20170207093709.0287cb68@canb.auug.org.au>
On Tue, Feb 07, 2017 at 09:37:09AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 6 Feb 2017 18:01:20 +0100 Ulrich Hecht <ulrich.hecht+renesas@gmail.com> wrote:
> >
> > On Mon, Feb 6, 2017 at 9:50 AM, Greg KH <greg@kroah.com> wrote:
> > >
> > > I think this is fixed by a patch I just took into my tree, which isn't
> > > in linux-next yet. Right Ulrich?
> >
> > That is correct, it's called in "[PATCH v4 2/4] serial: sh-sci:
> > SCIFA/B RX FIFO software timeout".
>
> I don't see that commit in any tree I have fetched.
That is correct, it's in my "testing" branch that I use to stage things
in before it gets sent to the branch that you pull from.
That branch is now merged with my -next branch, so you will see this
change the next time you sync.
thanks,
greg k-h
^ permalink raw reply
* linux-next: Tree for Feb 7
From: Stephen Rothwell @ 2017-02-07 5:50 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20170206:
The tty tree lost its build failure.
The akpm tree gained a conflict against the net-next tree.
Non-merge commits (relative to Linus' tree): 7711
8737 files changed, 327880 insertions(+), 163014 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 256 trees (counting Linus' and 37 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (d5adbfcd5f7b Linux 4.10-rc7)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
Merging arc-current/for-curr (8ba605b607b7 ARC: [plat-*] ARC_HAS_COH_CACHES no longer relevant)
Merging arm-current/fixes (228dbbfb5d77 ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write)
Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (a0615a16f7d0 powerpc/mm: Use the correct pointer when setting a 2MB pte)
Merging sparc/master (f9a42e0d58cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (b3f2d07f4649 hns: avoid stack overflow with CONFIG_KASAN)
Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl)
Merging netfilter/master (f95d7a46bc57 netfilter: ctnetlink: Fix regression in CTA_HELP processing)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware)
Merging mac80211/master (fd551bac4795 nl80211: Fix mesh HT operation check)
Merging sound-current/for-linus (37a7ea4a9b81 ALSA: seq: Don't handle loop timeout at snd_seq_pool_done())
Merging pci-current/for-linus (77fbffc2aa09 Revert "PCI: pciehp: Add runtime PM support for PCIe hotplug ports")
Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4)
Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4)
Merging usb.current/usb-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
Merging usb-serial-fixes/usb-linus (d07830db1bdb USB: serial: pl2303: add ATEN device ID)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
Merging staging.current/staging-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging char-misc.current/char-misc-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging input-current/for-linus (601bbbe05173 Input: uinput - fix crash when mixing old and new init style)
Merging crypto-current/master (7c2cf1c4615c crypto: chcr - Fix key length for RFC4106)
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
Merging vfio-fixes/for-linus (2da64d20a0b2 vfio/spapr: Fix missing mutex unlock when creating a window)
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging v4l-dvb-fixes/fixes (f9f96fc10c09 [media] cec: fix wrong last_la determination)
Merging drm-intel-fixes/for-linux-next-fixes (d5adbfcd5f7b Linux 4.10-rc7)
Merging drm-misc-fixes/for-linux-next-fixes (d5adbfcd5f7b Linux 4.10-rc7)
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging arm/for-next (1ba318e23204 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (bda50db88b8c Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
Merging amlogic/for-next (700501d48123 Merge v4.11/dt64)
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
Merging at91/at91-next (e514f82c67c1 Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (57aba12f97c2 Merge branch 'zte/pm-domains' into for-next)
Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
Merging mvebu/for-next (f8e8eda32b4a Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (bfdc40158227 Merge branch 'omap-for-v4.11/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (a844f941617c Merge tag 'qcom-arm64-for-4.11-2' into final-for-4.11)
Merging renesas/next (59fd3e06b3d7 Merge branches 'arm64-dt-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next)
Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (9689628ec120 Merge branch 'for-v4.11/drivers-soc-exynos-pmu-the-joy-never-ends' into for-next)
Merging tegra/for-next (6ef2dbf97439 Merge branch for-4.11/i2c into for-next)
Merging arm64/for-next/core (c0bfc549e962 perf: xgene: Include module.h)
Merging clk/clk-next (5775a4c76fbc Merge tag 'v4.11-rockchip-clk2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (dd51779bf9a6 m68k/defconfig: amcore board defconfig tuning)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (26eb4aa9a48a Merge branch '4.10-fixes' into mips-for-linux-next)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (07d7c4560b7a openrisc: head: Init r0 to 0 on start)
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
Merging powerpc/next (98a5f361b862 powerpc: Add new cache geometry aux vectors)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (f83435c42ee6 s390/qdio: improve some debug prints)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6e72293ab0e9 xtensa: fix noMMU build on cores with MMU)
Merging fscrypt/master (a5d431eff2e0 fscrypt: make fscrypt_operations.key_prefix a string)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (be449cc159bc Merge branch 'for-next-current-v4.10-20170203' into for-next-20170203)
Merging ceph/master (6df8c9d80a27 ceph: fix bad endianness handling in parse_reply_info_extra)
Merging cifs/for-next (ae6f8dd4d0c8 CIFS: Allow to switch on encryption with seal mount option)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (a074faad5126 udf: simplify udf_ioctl())
Merging ext4/dev (49a02bea2ca6 ext4: add EXT4_IOC_GOINGDOWN ioctl)
Merging f2fs/dev (71686e7197bf f2fs: call internal __write_data_page directly)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (210675270caa fuse: fix time_to_jiffies nsec sanity check)
Merging gfs2/for-next (c548a1c17560 gfs2: Make gfs2_write_full_page static)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging nfsd/nfsd-next (b88009210932 NFSDv4: use export cache flushtime for changeid on V4ROOT objects.)
Merging orangefs/for-next (9a2f47943781 orangefs: Dan Carpenter influenced cleanups...)
Merging overlayfs/overlayfs-next (97e147358bea vfs: wrap write f_ops with file_{start,end}_write())
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
Merging xfs/for-next (e0d76fa4475e xfs: prevent quotacheck from overloading inode lru)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (69973b830859 Linux 4.9)
Merging printk/for-next (0e91b7706038 printk: drop call_console_drivers() unused param)
Merging pci/next (83a96ebd0efa Merge branch 'pci/host-thunder' into next)
Merging pstore/for-next/pstore (0c744ea4f77d Linux 4.10-rc2)
Merging hid/for-next (88128caee0fc Merge branch 'for-4.10/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (f4d9f6fbbf57 Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (646933284e46 DT: add binding documentation for STTS751)
Merging jc_docs/docs-next (dc36143fba93 docs: Remove the copyright year from conf.py)
Merging v4l-dvb/master (47b037a0512d [media] v4l2-async: failing functions shouldn't have side effects)
Merging v4l-dvb-next/master (2437eec568ae Merge branch 'patchwork' into to_next)
Merging fbdev/fbdev-for-next (561eb9d09a93 fbdev: omap/lcd: Make callbacks optional)
Merging pm/linux-next (fd4c9e3a71b4 Merge branch 'pm-core-fixes' into linux-next)
CONFLICT (content): Merge conflict in arch/mips/configs/lemote2f_defconfig
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (7b09ae6042cd Merge branches 'ida-conversion' and 'for-rc' into next)
Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (f1225ee4c8fc swiotlb-xen: update dev_addr after swapping pages)
Merging net-next/master (9172d2a026f9 Merge branch 'dsa-add-fabric-notifier')
CONFLICT (content): Merge conflict in drivers/net/hyperv/netvsc.c
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging ipsec-next/master (62e13097c46c net: phy: broadcom: rehook BCM54612E specific init)
Merging netfilter-next/master (6e7bc478c9a0 net: skb_needs_check() accepts CHECKSUM_NONE for tx)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (36401cb7ffae brcmfmac: be more verbose when PSM's watchdog fires)
Merging bluetooth/master (264e6777f958 Merge branch 'netvsc-enhancements')
Merging mac80211-next/master (228c8c6b1f43 wireless: define cipher/AKM suites using a macro)
Merging rdma/for-next (24dc831b77ec IB/core: Add inline function to validate port)
Merging rdma-leon/rdma-next (69e8baab7757 Merge branch 'topic/core-for-4.11' into rdma-next)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging nand/nand/next (a4077ce58713 mtd: nand: Add Winbond manufacturer id)
Merging spi-nor/next (dc12bcccadaf mtd: spi-nor: cqspi: remove redundant dead code on error return check)
Merging crypto/master (1a20b9661265 crypto: arm/aes - don't use IV buffer to return final keystream block)
Merging drm/drm-next (99743ae4c5f5 Merge branch 'drm-etnaviv-next' of https://git.pengutronix.de/git/lst/linux into drm-next)
CONFLICT (content): Merge conflict in lib/Kconfig
CONFLICT (content): Merge conflict in include/drm/drm_connector.h
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sprite.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.c
Merging drm-panel/drm/panel/for-next (eaeebffa90f3 drm/panel: simple: Specify bus width and flags for EDT displays)
Merging drm-intel/for-linux-next (18566acac18f Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next)
Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices)
Merging drm-misc/for-linux-next (bb18dfcc640d drm: kselftest for drm_mm and bottom-up allocation)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (21c42da18ef1 drm/msm: return -EFAULT if copy_from_user() fails)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (83d642ee6dbe drm: mali-dp: fix stride setting for multi-plane formats)
Merging sunxi/sunxi/for-next (e24f5ead1d61 Merge branch 'sunxi/dt64-for-4.11' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
Merging kspp/for-next/kspp (ffa3140e4264 initify: Mark functions with the __unverified_nocapture attribute)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (e1b239f371c0 ALSA: x86: Refactor PCM process engine)
Merging sound-asoc/for-next (dd687adea61b Merge remote-tracking branches 'asoc/topic/wm0010', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (1f318a8bafcf modules: mark __inittest/__exittest as __maybe_unused)
Merging input/next (d5e6e0fa442a Merge branch 'synaptics-rmi4' into next)
Merging block/for-next (d8be8b7ee23a Merge branch 'master' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next)
Merging device-mapper/for-next (f5b0cba8f239 dm crypt: replace RCU read-side section with rwsem)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (0c3630150c9a mmc: core: start to break apart mmc_start_areq())
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (670a4a570c0c md: ensure md devices are freed before module is unloaded.)
Merging mfd/for-mfd-next (197ac6d28fce MAINTAINERS: Add include/dt-bindings/mfd to MFD entry)
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (744cc304a18f power: supply: add AC power supply driver for AXP20X and AXP22X PMICs)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (a7f1a67a2919 Merge remote-tracking branches 'regulator/topic/s2mpa01', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next)
Merging security/next (70ea163699b6 tpm: silence an array overflow warning)
Merging integrity/next (20f482ab9e0f ima: allow to check MAY_APPEND)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3a2f5a59a695 security,selinux,smack: kill security_task_wait hook)
Applying: selinux: merge fix for "smc: establish new socket family"
Merging tpmdd/next (70ea163699b6 tpm: silence an array overflow warning)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
Merging iommu/next (0e4b8ec58c3d Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'arm/mediatek', 'arm/core', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages)
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
Merging audit/next (62bc306e2083 audit: log 32-bit socketcalls)
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (8cf4664332d3 dt-bindings: power: reset: qnap-poweroff: Drop reference to pm_power_off)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (3f87493930a0 Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (5bf728f02218 Merge branch 'x86/platform')
CONFLICT (content): Merge conflict in security/apparmor/include/apparmor.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
Applying: locking/atomic, kref: merge fixup for code movement
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Merging edac-amd/for-next (321d17c19bf5 EDAC, mpc85xx: Add T2080 l2-cache support)
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
Merging ftrace/for-next (e704eff3ff51 ftrace: Have set_graph_function handle multiple functions in one write)
Merging rcu/rcu/next (40b1f8f7b57f rcu: Default RCU_FANOUT_LEAF to 16 unless explicitly changed)
CONFLICT (content): Merge conflict in net/netfilter/nf_conntrack_core.c
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Applying: smc: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Merging kvm/linux-next (0b4c208d443b Revert "KVM: nested VMX: disable perf cpuid reporting")
Merging kvm-arm/next (49a81ab0e8c7 KVM: arm/arm64: Emulate the EL1 phys timer registers)
Merging kvm-mips/next (12ed1faece3f KVM: MIPS: Allow multiple VCPUs to be created)
Merging kvm-ppc/kvm-ppc-next (050f23390f6b KVM: PPC: Book3S HV: Advertise availablity of HPT resizing on KVM HV)
Merging kvms390/next (fb7dc1d4ddce KVM: s390: detect some program check loops)
Merging xen-tip/linux-next (4fed1b125eb6 xen/manage: correct return value check on xenbus_scanf())
Merging percpu/for-next (966d2b04e070 percpu-refcount: fix reference leak during percpu-atomic transition)
Merging workqueues/for-next (a45463cbf3f9 workqueue: avoid clang warning)
Merging drivers-x86/for-next (e3c1763c26c0 platform/x86: intel_mid_powerbtn: Unify IRQ acknowledegment)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (8bb1de680dac tools/leds: Add led_hw_brightness_mon program)
Merging ipmi/for-next (c5afee1b0dfc acpi:ipmi: Make IPMI user handler const)
Merging driver-core/driver-core-next (64e90a8acb85 Introduce STATIC_USERMODEHELPER to mediate call_usermodehelper())
Merging usb/usb-next (7bddba775026 Merge 4.10-rc7 into usb-next)
Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions)
Merging usb-serial/usb-next (16620b483eaf USB: serial: sierra: fix bogus alternate-setting assumption)
Merging usb-chipidea-next/ci-for-usb-next (753dfd23612d usb: chipidea: msm: Fix return value check in ci_hdrc_msm_probe())
Merging phy-next/next (0b10f64dbe60 phy: qcom-ufs: Fix misplaced jump label)
Merging tty/tty-next (8ee3fde04758 tty_port: register tty ports with serdev bus)
Merging char-misc/char-misc-next (17fa87fe5a51 Merge 4.10-rc7 into char-misc-next)
CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst
Merging extcon/extcon-next (8ea227886002 extcon: arizona: Wait for any running HPDETs to complete on jack removal)
Merging staging/staging-next (a769f30c7bd7 Merge 4.10-rc7 into staging-next)
CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_parallel.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_parallel.c left in tree.
$ git rm -f drivers/staging/media/lirc/lirc_parallel.c
Merging slave-dma/next (bd98fba52645 Merge branch 'for-linus' into next)
Merging cgroup/for-next (63f1ca59453a Merge branch 'cgroup/for-4.11-rdmacg' into cgroup/for-4.11)
Merging scsi/for-next (66043a3bcbce Merge branch 'misc' into for-next)
Applying: scsi: mpt3sas: fix up for "block: fold cmd_type into the REQ_OP_ space"
Merging scsi-mkp/for-next (a76037ff3479 scsi: pm8001: switch to pci_irq_alloc_vectors)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (d5443f08f8d2 target: Avoid that XCOPY commands trigger a deadlock)
Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (80363894995b virtio_mmio: expose header to userspace)
Merging rpmsg/for-next (5029eb953682 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (e4df1ebdfeb4 Merge branch 'ib-gpiod-flags' into devel)
CONFLICT (content): Merge conflict in drivers/staging/greybus/gpio.c
Merging pinctrl/for-next (2039834c86f3 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (4651209c75d1 Merge branch 'for-4.11/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (1064f874abc0 mnt: Tuck mounts under others instead of creating shadow/side mounts.)
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1e4c2830c369 selftest: cpufreq: Add special tests)
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
Merging coresight/next (7f12a0d4a674 coresight: STM: Balance enable/disable)
Merging rtc/rtc-next (4c6106406eb1 rtc: sun6i: Fix compatibility with old DT binding)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (bfb34527a32a libnvdimm, pfn: fix memmap reservation size versus 4K alignment)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging extable/extable (24bf9bdef929 module.h: remove extable.h include now users have migrated)
Merging idr/idr-4.11 (39272ecab724 radix-tree: Store a pointer to the root in each node)
Merging akpm-current/current (96ae48eba50d ipc/mqueue: add missing sparse annotation)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs: add i_blocksize()
Applying: truncate: use i_blocksize()
Applying: nilfs2: use nilfs_btree_node_size()
Applying: nilfs2: use i_blocksize()
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
CONFLICT (content): Merge conflict in drivers/net/can/flexcan.c
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: scripts/spelling.txt: add some typo-words
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
Merging akpm/master (fa37acc7426c mm: clarify mm_struct.mm_{users,count} documentation)
^ permalink raw reply
* linux-next: manual merge of the akpm tree with the net-next tree
From: Stephen Rothwell @ 2017-02-07 5:23 UTC (permalink / raw)
To: Andrew Morton, David Miller, Networking
Cc: linux-next, linux-kernel, Marc Kleine-Budde, Masahiro Yamada
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
drivers/net/can/flexcan.c
between commits:
9eb7aa891101 ("can: flexcan: add quirk FLEXCAN_QUIRK_ENABLE_EACEN_RRS")
b3cf53e988ce ("can: flexcan: add support for timestamp based rx-offload")
from the net-next tree and commit:
"scripts/spelling.txt: add "disble(d)" pattern and fix typo instances"
from the akpm 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/can/flexcan.c
index ea57fed375c6,4dc71bce525c..000000000000
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@@ -195,9 -189,7 +195,9 @@@
*/
#define FLEXCAN_QUIRK_BROKEN_ERR_STATE BIT(1) /* [TR]WRN_INT not connected */
#define FLEXCAN_QUIRK_DISABLE_RXFG BIT(2) /* Disable RX FIFO Global mask */
-#define FLEXCAN_QUIRK_DISABLE_MECR BIT(3) /* Disable Memory error detection */
+#define FLEXCAN_QUIRK_ENABLE_EACEN_RRS BIT(3) /* Enable EACEN and RRS bit in ctrl2 */
- #define FLEXCAN_QUIRK_DISABLE_MECR BIT(4) /* Disble Memory error detection */
++#define FLEXCAN_QUIRK_DISABLE_MECR BIT(4) /* Disbale Memory error detection */
+#define FLEXCAN_QUIRK_USE_OFF_TIMESTAMP BIT(5) /* Use timestamp based offloading */
/* Structure of the message buffer */
struct flexcan_mb {
^ permalink raw reply
* Re: linux-next: build warning after merge of the tty tree
From: Stephen Rothwell @ 2017-02-06 22:37 UTC (permalink / raw)
To: Ulrich Hecht
Cc: Greg KH, linux-next, linux-kernel@vger.kernel.org,
Geert Uytterhoeven
In-Reply-To: <CAO3366y+pGVY78BDtgkeqDenKqfnhdpxaRRFPUjnw2bwoMGYnQ@mail.gmail.com>
Hi all,
On Mon, 6 Feb 2017 18:01:20 +0100 Ulrich Hecht <ulrich.hecht+renesas@gmail.com> wrote:
>
> On Mon, Feb 6, 2017 at 9:50 AM, Greg KH <greg@kroah.com> wrote:
> >
> > I think this is fixed by a patch I just took into my tree, which isn't
> > in linux-next yet. Right Ulrich?
>
> That is correct, it's called in "[PATCH v4 2/4] serial: sh-sci:
> SCIFA/B RX FIFO software timeout".
I don't see that commit in any tree I have fetched.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the tty tree
From: Stephen Rothwell @ 2017-02-06 20:38 UTC (permalink / raw)
To: Greg KH
Cc: Rob Herring, linux-next, linux-kernel@vger.kernel.org,
Sebastian Reichel
In-Reply-To: <20170206151822.GA13626@kroah.com>
Hi Greg,
On Mon, 6 Feb 2017 16:18:22 +0100 Greg KH <greg@kroah.com> wrote:
>
> On Mon, Feb 06, 2017 at 08:09:16AM -0600, Rob Herring wrote:
> >
> > It didn't, but we happened to already have a fix queued up for 4.11.
> > The fix is in your usb-next branch:
> >
> > commit 7a3b7cd332db08546f3cdd984f11773e0d1999e7
> > Author: Stephen Boyd <stephen.boyd@linaro.org>
> > Date: Wed Dec 28 14:56:48 2016 -0800
> >
> > of: device: Export of_device_{get_modalias, uvent_modalias} to modules
> >
> > The ULPI bus can be built as a module, and it will soon be
> > calling these functions when it supports probing devices from DT.
> > Export them so they can be used by the ULPI module.
> >
> > Acked-by: Rob Herring <robh@kernel.org>
> > Cc: <devicetree@vger.kernel.org>
> > Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
> > Signed-off-by: Peter Chen <peter.chen@nxp.com>
>
> Ah, so the if this is pulled into linux-next at the same time, then
> there's no build error.
>
> Stephen, do you need/want me to cherry-pick this into the tty branch, or
> is it ok as-is?
I will change things so that I merge the usb tree before the tty tree.
Please remember to tell Linus that they need to be merged in that order.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: crypto: atmel - Fix authenc compile test warnings
From: kbuild test robot @ 2017-02-06 19:02 UTC (permalink / raw)
To: Herbert Xu
Cc: kbuild-all, Stephen Rothwell, linux-next, linux-kernel,
Cyrille Pitchen, Linux Crypto Mailing List
In-Reply-To: <20170206090340.GA9531@gondor.apana.org.au>
[-- Attachment #1: Type: text/plain, Size: 14723 bytes --]
Hi Herbert,
[auto build test WARNING on cryptodev/master]
[also build test WARNING on v4.10-rc7]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Herbert-Xu/crypto-atmel-Fix-authenc-compile-test-warnings/20170206-171201
base: https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git master
config: tile-allmodconfig (attached as .config)
compiler: tilegx-linux-gcc (GCC) 4.6.2
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=tile
All warnings (new ones prefixed by >>):
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_sg_copy':
>> drivers/crypto/atmel-tdes.c:157:11: warning: comparison of distinct pointer types lacks a cast [enabled by default]
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_crypt_pdc_stop':
>> drivers/crypto/atmel-tdes.c:339:4: warning: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'size_t' [-Wformat]
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_buff_init':
>> drivers/crypto/atmel-tdes.c:364:3: warning: format '%d' expects argument of type 'int', but argument 3 has type 'size_t' [-Wformat]
drivers/crypto/atmel-tdes.c:372:3: warning: format '%d' expects argument of type 'int', but argument 3 has type 'size_t' [-Wformat]
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_crypt_start':
drivers/crypto/atmel-tdes.c:528:11: warning: comparison of distinct pointer types lacks a cast [enabled by default]
drivers/crypto/atmel-tdes.c:529:11: warning: comparison of distinct pointer types lacks a cast [enabled by default]
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_crypt_dma_stop':
drivers/crypto/atmel-tdes.c:664:5: warning: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'size_t' [-Wformat]
vim +157 drivers/crypto/atmel-tdes.c
13802005 Nicolas Royer 2012-07-01 151 void *buf, size_t buflen, size_t total, int out)
13802005 Nicolas Royer 2012-07-01 152 {
13802005 Nicolas Royer 2012-07-01 153 unsigned int count, off = 0;
13802005 Nicolas Royer 2012-07-01 154
13802005 Nicolas Royer 2012-07-01 155 while (buflen && total) {
13802005 Nicolas Royer 2012-07-01 156 count = min((*sg)->length - *offset, total);
13802005 Nicolas Royer 2012-07-01 @157 count = min(count, buflen);
13802005 Nicolas Royer 2012-07-01 158
13802005 Nicolas Royer 2012-07-01 159 if (!count)
13802005 Nicolas Royer 2012-07-01 160 return off;
13802005 Nicolas Royer 2012-07-01 161
13802005 Nicolas Royer 2012-07-01 162 scatterwalk_map_and_copy(buf + off, *sg, *offset, count, out);
13802005 Nicolas Royer 2012-07-01 163
13802005 Nicolas Royer 2012-07-01 164 off += count;
13802005 Nicolas Royer 2012-07-01 165 buflen -= count;
13802005 Nicolas Royer 2012-07-01 166 *offset += count;
13802005 Nicolas Royer 2012-07-01 167 total -= count;
13802005 Nicolas Royer 2012-07-01 168
13802005 Nicolas Royer 2012-07-01 169 if (*offset == (*sg)->length) {
13802005 Nicolas Royer 2012-07-01 170 *sg = sg_next(*sg);
13802005 Nicolas Royer 2012-07-01 171 if (*sg)
13802005 Nicolas Royer 2012-07-01 172 *offset = 0;
13802005 Nicolas Royer 2012-07-01 173 else
13802005 Nicolas Royer 2012-07-01 174 total = 0;
13802005 Nicolas Royer 2012-07-01 175 }
13802005 Nicolas Royer 2012-07-01 176 }
13802005 Nicolas Royer 2012-07-01 177
13802005 Nicolas Royer 2012-07-01 178 return off;
13802005 Nicolas Royer 2012-07-01 179 }
13802005 Nicolas Royer 2012-07-01 180
13802005 Nicolas Royer 2012-07-01 181 static inline u32 atmel_tdes_read(struct atmel_tdes_dev *dd, u32 offset)
13802005 Nicolas Royer 2012-07-01 182 {
13802005 Nicolas Royer 2012-07-01 183 return readl_relaxed(dd->io_base + offset);
13802005 Nicolas Royer 2012-07-01 184 }
13802005 Nicolas Royer 2012-07-01 185
13802005 Nicolas Royer 2012-07-01 186 static inline void atmel_tdes_write(struct atmel_tdes_dev *dd,
13802005 Nicolas Royer 2012-07-01 187 u32 offset, u32 value)
13802005 Nicolas Royer 2012-07-01 188 {
13802005 Nicolas Royer 2012-07-01 189 writel_relaxed(value, dd->io_base + offset);
13802005 Nicolas Royer 2012-07-01 190 }
13802005 Nicolas Royer 2012-07-01 191
13802005 Nicolas Royer 2012-07-01 192 static void atmel_tdes_write_n(struct atmel_tdes_dev *dd, u32 offset,
13802005 Nicolas Royer 2012-07-01 193 u32 *value, int count)
13802005 Nicolas Royer 2012-07-01 194 {
13802005 Nicolas Royer 2012-07-01 195 for (; count--; value++, offset += 4)
13802005 Nicolas Royer 2012-07-01 196 atmel_tdes_write(dd, offset, *value);
13802005 Nicolas Royer 2012-07-01 197 }
13802005 Nicolas Royer 2012-07-01 198
13802005 Nicolas Royer 2012-07-01 199 static struct atmel_tdes_dev *atmel_tdes_find_dev(struct atmel_tdes_ctx *ctx)
13802005 Nicolas Royer 2012-07-01 200 {
13802005 Nicolas Royer 2012-07-01 201 struct atmel_tdes_dev *tdes_dd = NULL;
13802005 Nicolas Royer 2012-07-01 202 struct atmel_tdes_dev *tmp;
13802005 Nicolas Royer 2012-07-01 203
13802005 Nicolas Royer 2012-07-01 204 spin_lock_bh(&atmel_tdes.lock);
13802005 Nicolas Royer 2012-07-01 205 if (!ctx->dd) {
13802005 Nicolas Royer 2012-07-01 206 list_for_each_entry(tmp, &atmel_tdes.dev_list, list) {
13802005 Nicolas Royer 2012-07-01 207 tdes_dd = tmp;
13802005 Nicolas Royer 2012-07-01 208 break;
13802005 Nicolas Royer 2012-07-01 209 }
13802005 Nicolas Royer 2012-07-01 210 ctx->dd = tdes_dd;
13802005 Nicolas Royer 2012-07-01 211 } else {
13802005 Nicolas Royer 2012-07-01 212 tdes_dd = ctx->dd;
13802005 Nicolas Royer 2012-07-01 213 }
13802005 Nicolas Royer 2012-07-01 214 spin_unlock_bh(&atmel_tdes.lock);
13802005 Nicolas Royer 2012-07-01 215
13802005 Nicolas Royer 2012-07-01 216 return tdes_dd;
13802005 Nicolas Royer 2012-07-01 217 }
13802005 Nicolas Royer 2012-07-01 218
13802005 Nicolas Royer 2012-07-01 219 static int atmel_tdes_hw_init(struct atmel_tdes_dev *dd)
13802005 Nicolas Royer 2012-07-01 220 {
9d83d299 LABBE Corentin 2015-10-02 221 int err;
9d83d299 LABBE Corentin 2015-10-02 222
9d83d299 LABBE Corentin 2015-10-02 223 err = clk_prepare_enable(dd->iclk);
9d83d299 LABBE Corentin 2015-10-02 224 if (err)
9d83d299 LABBE Corentin 2015-10-02 225 return err;
13802005 Nicolas Royer 2012-07-01 226
13802005 Nicolas Royer 2012-07-01 227 if (!(dd->flags & TDES_FLAGS_INIT)) {
13802005 Nicolas Royer 2012-07-01 228 atmel_tdes_write(dd, TDES_CR, TDES_CR_SWRST);
13802005 Nicolas Royer 2012-07-01 229 dd->flags |= TDES_FLAGS_INIT;
13802005 Nicolas Royer 2012-07-01 230 dd->err = 0;
13802005 Nicolas Royer 2012-07-01 231 }
13802005 Nicolas Royer 2012-07-01 232
13802005 Nicolas Royer 2012-07-01 233 return 0;
13802005 Nicolas Royer 2012-07-01 234 }
13802005 Nicolas Royer 2012-07-01 235
1f858040 Nicolas Royer 2013-02-20 236 static inline unsigned int atmel_tdes_get_version(struct atmel_tdes_dev *dd)
1f858040 Nicolas Royer 2013-02-20 237 {
1f858040 Nicolas Royer 2013-02-20 238 return atmel_tdes_read(dd, TDES_HW_VERSION) & 0x00000fff;
1f858040 Nicolas Royer 2013-02-20 239 }
1f858040 Nicolas Royer 2013-02-20 240
1f858040 Nicolas Royer 2013-02-20 241 static void atmel_tdes_hw_version_init(struct atmel_tdes_dev *dd)
1f858040 Nicolas Royer 2013-02-20 242 {
1f858040 Nicolas Royer 2013-02-20 243 atmel_tdes_hw_init(dd);
1f858040 Nicolas Royer 2013-02-20 244
1f858040 Nicolas Royer 2013-02-20 245 dd->hw_version = atmel_tdes_get_version(dd);
1f858040 Nicolas Royer 2013-02-20 246
1f858040 Nicolas Royer 2013-02-20 247 dev_info(dd->dev,
1f858040 Nicolas Royer 2013-02-20 248 "version: 0x%x\n", dd->hw_version);
1f858040 Nicolas Royer 2013-02-20 249
1f858040 Nicolas Royer 2013-02-20 250 clk_disable_unprepare(dd->iclk);
1f858040 Nicolas Royer 2013-02-20 251 }
1f858040 Nicolas Royer 2013-02-20 252
1f858040 Nicolas Royer 2013-02-20 253 static void atmel_tdes_dma_callback(void *data)
1f858040 Nicolas Royer 2013-02-20 254 {
1f858040 Nicolas Royer 2013-02-20 255 struct atmel_tdes_dev *dd = data;
1f858040 Nicolas Royer 2013-02-20 256
1f858040 Nicolas Royer 2013-02-20 257 /* dma_lch_out - completed */
1f858040 Nicolas Royer 2013-02-20 258 tasklet_schedule(&dd->done_task);
1f858040 Nicolas Royer 2013-02-20 259 }
1f858040 Nicolas Royer 2013-02-20 260
13802005 Nicolas Royer 2012-07-01 261 static int atmel_tdes_write_ctrl(struct atmel_tdes_dev *dd)
13802005 Nicolas Royer 2012-07-01 262 {
13802005 Nicolas Royer 2012-07-01 263 int err;
13802005 Nicolas Royer 2012-07-01 264 u32 valcr = 0, valmr = TDES_MR_SMOD_PDC;
13802005 Nicolas Royer 2012-07-01 265
13802005 Nicolas Royer 2012-07-01 266 err = atmel_tdes_hw_init(dd);
13802005 Nicolas Royer 2012-07-01 267
13802005 Nicolas Royer 2012-07-01 268 if (err)
13802005 Nicolas Royer 2012-07-01 269 return err;
13802005 Nicolas Royer 2012-07-01 270
1f858040 Nicolas Royer 2013-02-20 271 if (!dd->caps.has_dma)
1f858040 Nicolas Royer 2013-02-20 272 atmel_tdes_write(dd, TDES_PTCR,
1f858040 Nicolas Royer 2013-02-20 273 TDES_PTCR_TXTDIS | TDES_PTCR_RXTDIS);
13802005 Nicolas Royer 2012-07-01 274
13802005 Nicolas Royer 2012-07-01 275 /* MR register must be set before IV registers */
13802005 Nicolas Royer 2012-07-01 276 if (dd->ctx->keylen > (DES_KEY_SIZE << 1)) {
13802005 Nicolas Royer 2012-07-01 277 valmr |= TDES_MR_KEYMOD_3KEY;
13802005 Nicolas Royer 2012-07-01 278 valmr |= TDES_MR_TDESMOD_TDES;
13802005 Nicolas Royer 2012-07-01 279 } else if (dd->ctx->keylen > DES_KEY_SIZE) {
13802005 Nicolas Royer 2012-07-01 280 valmr |= TDES_MR_KEYMOD_2KEY;
13802005 Nicolas Royer 2012-07-01 281 valmr |= TDES_MR_TDESMOD_TDES;
13802005 Nicolas Royer 2012-07-01 282 } else {
13802005 Nicolas Royer 2012-07-01 283 valmr |= TDES_MR_TDESMOD_DES;
13802005 Nicolas Royer 2012-07-01 284 }
13802005 Nicolas Royer 2012-07-01 285
13802005 Nicolas Royer 2012-07-01 286 if (dd->flags & TDES_FLAGS_CBC) {
13802005 Nicolas Royer 2012-07-01 287 valmr |= TDES_MR_OPMOD_CBC;
13802005 Nicolas Royer 2012-07-01 288 } else if (dd->flags & TDES_FLAGS_CFB) {
13802005 Nicolas Royer 2012-07-01 289 valmr |= TDES_MR_OPMOD_CFB;
13802005 Nicolas Royer 2012-07-01 290
13802005 Nicolas Royer 2012-07-01 291 if (dd->flags & TDES_FLAGS_CFB8)
13802005 Nicolas Royer 2012-07-01 292 valmr |= TDES_MR_CFBS_8b;
13802005 Nicolas Royer 2012-07-01 293 else if (dd->flags & TDES_FLAGS_CFB16)
13802005 Nicolas Royer 2012-07-01 294 valmr |= TDES_MR_CFBS_16b;
13802005 Nicolas Royer 2012-07-01 295 else if (dd->flags & TDES_FLAGS_CFB32)
13802005 Nicolas Royer 2012-07-01 296 valmr |= TDES_MR_CFBS_32b;
1f858040 Nicolas Royer 2013-02-20 297 else if (dd->flags & TDES_FLAGS_CFB64)
1f858040 Nicolas Royer 2013-02-20 298 valmr |= TDES_MR_CFBS_64b;
13802005 Nicolas Royer 2012-07-01 299 } else if (dd->flags & TDES_FLAGS_OFB) {
13802005 Nicolas Royer 2012-07-01 300 valmr |= TDES_MR_OPMOD_OFB;
13802005 Nicolas Royer 2012-07-01 301 }
13802005 Nicolas Royer 2012-07-01 302
13802005 Nicolas Royer 2012-07-01 303 if ((dd->flags & TDES_FLAGS_ENCRYPT) || (dd->flags & TDES_FLAGS_OFB))
13802005 Nicolas Royer 2012-07-01 304 valmr |= TDES_MR_CYPHER_ENC;
13802005 Nicolas Royer 2012-07-01 305
13802005 Nicolas Royer 2012-07-01 306 atmel_tdes_write(dd, TDES_CR, valcr);
13802005 Nicolas Royer 2012-07-01 307 atmel_tdes_write(dd, TDES_MR, valmr);
13802005 Nicolas Royer 2012-07-01 308
13802005 Nicolas Royer 2012-07-01 309 atmel_tdes_write_n(dd, TDES_KEY1W1R, dd->ctx->key,
13802005 Nicolas Royer 2012-07-01 310 dd->ctx->keylen >> 2);
13802005 Nicolas Royer 2012-07-01 311
13802005 Nicolas Royer 2012-07-01 312 if (((dd->flags & TDES_FLAGS_CBC) || (dd->flags & TDES_FLAGS_CFB) ||
13802005 Nicolas Royer 2012-07-01 313 (dd->flags & TDES_FLAGS_OFB)) && dd->req->info) {
13802005 Nicolas Royer 2012-07-01 314 atmel_tdes_write_n(dd, TDES_IV1R, dd->req->info, 2);
13802005 Nicolas Royer 2012-07-01 315 }
13802005 Nicolas Royer 2012-07-01 316
13802005 Nicolas Royer 2012-07-01 317 return 0;
13802005 Nicolas Royer 2012-07-01 318 }
13802005 Nicolas Royer 2012-07-01 319
1f858040 Nicolas Royer 2013-02-20 320 static int atmel_tdes_crypt_pdc_stop(struct atmel_tdes_dev *dd)
13802005 Nicolas Royer 2012-07-01 321 {
13802005 Nicolas Royer 2012-07-01 322 int err = 0;
13802005 Nicolas Royer 2012-07-01 323 size_t count;
13802005 Nicolas Royer 2012-07-01 324
13802005 Nicolas Royer 2012-07-01 325 atmel_tdes_write(dd, TDES_PTCR, TDES_PTCR_TXTDIS|TDES_PTCR_RXTDIS);
13802005 Nicolas Royer 2012-07-01 326
13802005 Nicolas Royer 2012-07-01 327 if (dd->flags & TDES_FLAGS_FAST) {
13802005 Nicolas Royer 2012-07-01 328 dma_unmap_sg(dd->dev, dd->out_sg, 1, DMA_FROM_DEVICE);
13802005 Nicolas Royer 2012-07-01 329 dma_unmap_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE);
13802005 Nicolas Royer 2012-07-01 330 } else {
13802005 Nicolas Royer 2012-07-01 331 dma_sync_single_for_device(dd->dev, dd->dma_addr_out,
13802005 Nicolas Royer 2012-07-01 332 dd->dma_size, DMA_FROM_DEVICE);
13802005 Nicolas Royer 2012-07-01 333
13802005 Nicolas Royer 2012-07-01 334 /* copy data */
13802005 Nicolas Royer 2012-07-01 335 count = atmel_tdes_sg_copy(&dd->out_sg, &dd->out_offset,
13802005 Nicolas Royer 2012-07-01 336 dd->buf_out, dd->buflen, dd->dma_size, 1);
13802005 Nicolas Royer 2012-07-01 337 if (count != dd->dma_size) {
13802005 Nicolas Royer 2012-07-01 338 err = -EINVAL;
13802005 Nicolas Royer 2012-07-01 @339 pr_err("not all data converted: %u\n", count);
13802005 Nicolas Royer 2012-07-01 340 }
13802005 Nicolas Royer 2012-07-01 341 }
13802005 Nicolas Royer 2012-07-01 342
:::::: The code at line 157 was first introduced by commit
:::::: 13802005d8f2db244ec1f5d7f6923de8f7a463db crypto: atmel - add Atmel DES/TDES driver
:::::: TO: Nicolas Royer <nicolas@eukrea.com>
:::::: CC: Herbert Xu <herbert@gondor.apana.org.au>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 47135 bytes --]
^ permalink raw reply
* Re: linux-next: build warning after merge of the tty tree
From: Ulrich Hecht @ 2017-02-06 17:01 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, linux-next, linux-kernel@vger.kernel.org,
Geert Uytterhoeven
In-Reply-To: <20170206085042.GA3726@kroah.com>
On Mon, Feb 6, 2017 at 9:50 AM, Greg KH <greg@kroah.com> wrote:
> On Mon, Feb 06, 2017 at 03:16:38PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> After merging the tty tree, today's linux-next build
>> (arm_multi_v7_defconfig) produced this warning:
>>
>> drivers/tty/serial/sh-sci.c:977:12: warning: 'scif_set_rtrg' defined but not used [-Wunused-function]
>> static int scif_set_rtrg(struct uart_port *port, int rx_trig)
>> ^
>>
>> Introduced by commit
>>
>> a380ed461f66 ("serial: sh-sci: implement FIFO threshold register setting")
>>
>> Forgot to add a call to this new function?
>
> I think this is fixed by a patch I just took into my tree, which isn't
> in linux-next yet. Right Ulrich?
That is correct, it's called in "[PATCH v4 2/4] serial: sh-sci:
SCIFA/B RX FIFO software timeout".
CU
Uli
^ permalink raw reply
* Re: crypto: atmel - Fix authenc compile test warnings
From: kbuild test robot @ 2017-02-06 16:58 UTC (permalink / raw)
To: Herbert Xu
Cc: kbuild-all, Stephen Rothwell, linux-next, linux-kernel,
Cyrille Pitchen, Linux Crypto Mailing List
In-Reply-To: <20170206090340.GA9531@gondor.apana.org.au>
Hi Herbert,
[auto build test WARNING on cryptodev/master]
[also build test WARNING on v4.10-rc7 next-20170206]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Herbert-Xu/crypto-atmel-Fix-authenc-compile-test-warnings/20170206-171201
base: https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git master
reproduce:
# apt-get install sparse
make ARCH=x86_64 allmodconfig
make C=1 CF=-D__CHECK_ENDIAN__
sparse warnings: (new ones prefixed by >>)
include/linux/compiler.h:253:8: sparse: attribute 'no_sanitize_address': unknown attribute
>> drivers/crypto/atmel-tdes.c:157:25: sparse: incompatible types in comparison expression (different type sizes)
drivers/crypto/atmel-tdes.c:528:25: sparse: incompatible types in comparison expression (different type sizes)
drivers/crypto/atmel-tdes.c:529:25: sparse: incompatible types in comparison expression (different type sizes)
In file included from drivers/crypto/atmel-tdes.c:17:0:
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_sg_copy':
include/linux/kernel.h:753:16: warning: comparison of distinct pointer types lacks a cast
(void) (&min1 == &min2); \
^
include/linux/kernel.h:756:2: note: in expansion of macro '__min'
__min(typeof(x), typeof(y), \
^~~~~
drivers/crypto/atmel-tdes.c:157:11: note: in expansion of macro 'min'
count = min(count, buflen);
^~~
In file included from include/linux/printk.h:6:0,
from include/linux/kernel.h:13,
from drivers/crypto/atmel-tdes.c:17:
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_crypt_pdc_stop':
include/linux/kern_levels.h:4:18: warning: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'size_t {aka long unsigned int}' [-Wformat=]
#define KERN_SOH "\001" /* ASCII Start Of Header */
^
include/linux/kern_levels.h:10:18: note: in expansion of macro 'KERN_SOH'
#define KERN_ERR KERN_SOH "3" /* error conditions */
^~~~~~~~
include/linux/printk.h:292:9: note: in expansion of macro 'KERN_ERR'
printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
^~~~~~~~
drivers/crypto/atmel-tdes.c:339:4: note: in expansion of macro 'pr_err'
pr_err("not all data converted: %u\n", count);
^~~~~~
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_buff_init':
drivers/crypto/atmel-tdes.c:364:26: warning: format '%d' expects argument of type 'int', but argument 3 has type 'size_t {aka long unsigned int}' [-Wformat=]
dev_err(dd->dev, "dma %d bytes error\n", dd->buflen);
^
drivers/crypto/atmel-tdes.c:372:26: warning: format '%d' expects argument of type 'int', but argument 3 has type 'size_t {aka long unsigned int}' [-Wformat=]
dev_err(dd->dev, "dma %d bytes error\n", dd->buflen);
^
In file included from drivers/crypto/atmel-tdes.c:17:0:
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_crypt_start':
include/linux/kernel.h:753:16: warning: comparison of distinct pointer types lacks a cast
(void) (&min1 == &min2); \
^
include/linux/kernel.h:756:2: note: in expansion of macro '__min'
__min(typeof(x), typeof(y), \
^~~~~
drivers/crypto/atmel-tdes.c:528:11: note: in expansion of macro 'min'
count = min(dd->total, sg_dma_len(dd->in_sg));
^~~
include/linux/kernel.h:753:16: warning: comparison of distinct pointer types lacks a cast
(void) (&min1 == &min2); \
^
include/linux/kernel.h:756:2: note: in expansion of macro '__min'
__min(typeof(x), typeof(y), \
^~~~~
drivers/crypto/atmel-tdes.c:529:11: note: in expansion of macro 'min'
count = min(count, sg_dma_len(dd->out_sg));
^~~
In file included from include/linux/printk.h:6:0,
from include/linux/kernel.h:13,
from drivers/crypto/atmel-tdes.c:17:
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_crypt_dma_stop':
include/linux/kern_levels.h:4:18: warning: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'size_t {aka long unsigned int}' [-Wformat=]
#define KERN_SOH "\001" /* ASCII Start Of Header */
^
include/linux/kern_levels.h:10:18: note: in expansion of macro 'KERN_SOH'
#define KERN_ERR KERN_SOH "3" /* error conditions */
^~~~~~~~
include/linux/printk.h:292:9: note: in expansion of macro 'KERN_ERR'
printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
^~~~~~~~
drivers/crypto/atmel-tdes.c:664:5: note: in expansion of macro 'pr_err'
pr_err("not all data converted: %u\n", count);
^~~~~~
vim +157 drivers/crypto/atmel-tdes.c
13802005 Nicolas Royer 2012-07-01 141 struct list_head dev_list;
13802005 Nicolas Royer 2012-07-01 142 spinlock_t lock;
13802005 Nicolas Royer 2012-07-01 143 };
13802005 Nicolas Royer 2012-07-01 144
13802005 Nicolas Royer 2012-07-01 145 static struct atmel_tdes_drv atmel_tdes = {
13802005 Nicolas Royer 2012-07-01 146 .dev_list = LIST_HEAD_INIT(atmel_tdes.dev_list),
13802005 Nicolas Royer 2012-07-01 147 .lock = __SPIN_LOCK_UNLOCKED(atmel_tdes.lock),
13802005 Nicolas Royer 2012-07-01 148 };
13802005 Nicolas Royer 2012-07-01 149
13802005 Nicolas Royer 2012-07-01 150 static int atmel_tdes_sg_copy(struct scatterlist **sg, size_t *offset,
13802005 Nicolas Royer 2012-07-01 151 void *buf, size_t buflen, size_t total, int out)
13802005 Nicolas Royer 2012-07-01 152 {
13802005 Nicolas Royer 2012-07-01 153 unsigned int count, off = 0;
13802005 Nicolas Royer 2012-07-01 154
13802005 Nicolas Royer 2012-07-01 155 while (buflen && total) {
13802005 Nicolas Royer 2012-07-01 156 count = min((*sg)->length - *offset, total);
13802005 Nicolas Royer 2012-07-01 @157 count = min(count, buflen);
13802005 Nicolas Royer 2012-07-01 158
13802005 Nicolas Royer 2012-07-01 159 if (!count)
13802005 Nicolas Royer 2012-07-01 160 return off;
13802005 Nicolas Royer 2012-07-01 161
13802005 Nicolas Royer 2012-07-01 162 scatterwalk_map_and_copy(buf + off, *sg, *offset, count, out);
13802005 Nicolas Royer 2012-07-01 163
13802005 Nicolas Royer 2012-07-01 164 off += count;
13802005 Nicolas Royer 2012-07-01 165 buflen -= count;
:::::: The code at line 157 was first introduced by commit
:::::: 13802005d8f2db244ec1f5d7f6923de8f7a463db crypto: atmel - add Atmel DES/TDES driver
:::::: TO: Nicolas Royer <nicolas@eukrea.com>
:::::: CC: Herbert Xu <herbert@gondor.apana.org.au>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
^ permalink raw reply
* Re: linux-next: manual merge of the arm64 tree with the qcom tree
From: Andy Gross @ 2017-02-06 15:45 UTC (permalink / raw)
To: Will Deacon
Cc: Stephen Rothwell, Catalin Marinas, linux-next, Linux Kernel list
In-Reply-To: <20170206114418.GB19939@arm.com>
On 6 February 2017 at 05:44, Will Deacon <will.deacon@arm.com> wrote:
> On Mon, Feb 06, 2017 at 10:23:29AM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the arm64 tree got conflicts in:
>>
>> arch/arm/kernel/armksyms.c
>> arch/arm64/kernel/arm64ksyms.c
>> arch/arm64/kernel/smccc-call.S
>> include/linux/arm-smccc.h
>>
>> between commits:
>>
>> 0a0c5b832751 ("arm: kernel: Add SMC structure parameter")
>> 9c96e7f72029 ("firmware: qcom: scm: Fix interrupted SCM calls")
>>
>> from the qcom tree and commits:
>>
>> 680a0873e193 ("arm: kernel: Add SMC structure parameter")
>> 82bcd087029f ("firmware: qcom: scm: Fix interrupted SCM calls")
>>
>> from the arm64 tree.
>>
>> I fixed it up (please check the final resolution when it is released,
>> or fix these up) 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.
>
> Thanks Stephen, although if looks like you've resolved the conflict to
> be what is in the qcom tree, which is in fact an earlier version of this
> patch series.
>
> Andy, please can you drop your stuff from -next now that a newer version
> is queued via arm64? (and also please check that you're happy with what
> I've got queued).
Done. And looking at your for-next/core, what you have is correct.
Regards,
Andy
^ permalink raw reply
* Re: linux-next: build failure after merge of the tty tree
From: Greg KH @ 2017-02-06 15:18 UTC (permalink / raw)
To: Rob Herring
Cc: Stephen Rothwell, linux-next, linux-kernel@vger.kernel.org,
Sebastian Reichel
In-Reply-To: <CAL_JsqJnzCNtg19jKekzQyMO6fuqt3b1JU-ps=5MJByKGC1xLg@mail.gmail.com>
On Mon, Feb 06, 2017 at 08:09:16AM -0600, Rob Herring wrote:
> On Mon, Feb 6, 2017 at 2:51 AM, Greg KH <greg@kroah.com> wrote:
> > On Mon, Feb 06, 2017 at 03:22:09PM +1100, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> After merging the tty tree, today's linux-next build (x86_64 allmodconfig)
> >> failed like this:
> >>
> >> ERROR: "of_device_uevent_modalias" [drivers/tty/serdev/serdev.ko] undefined!
> >> ERROR: "of_device_get_modalias" [drivers/tty/serdev/serdev.ko] undefined!
> >>
> >> Caused by commit
> >>
> >> cd6484e1830b ("serdev: Introduce new bus for serial attached devices")
> >>
> >> I have used the tty tree from next-20170203 for today.
> >
> > Ugh, how has this been passing the 0-day bot builds succesfully?
> >
> > Rob, any ideas?
>
> It didn't, but we happened to already have a fix queued up for 4.11.
> The fix is in your usb-next branch:
>
> commit 7a3b7cd332db08546f3cdd984f11773e0d1999e7
> Author: Stephen Boyd <stephen.boyd@linaro.org>
> Date: Wed Dec 28 14:56:48 2016 -0800
>
> of: device: Export of_device_{get_modalias, uvent_modalias} to modules
>
> The ULPI bus can be built as a module, and it will soon be
> calling these functions when it supports probing devices from DT.
> Export them so they can be used by the ULPI module.
>
> Acked-by: Rob Herring <robh@kernel.org>
> Cc: <devicetree@vger.kernel.org>
> Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
> Signed-off-by: Peter Chen <peter.chen@nxp.com>
Ah, so the if this is pulled into linux-next at the same time, then
there's no build error.
Stephen, do you need/want me to cherry-pick this into the tty branch, or
is it ok as-is?
thanks,
greg k-h
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Paul E. McKenney @ 2017-02-06 15:14 UTC (permalink / raw)
To: Sachin Sant
Cc: Peter Zijlstra, Matt Fleming, linuxppc-dev@lists.ozlabs.org,
Mike Galbraith, LKML, linux-next@vger.kernel.org, Ross Zwisler
In-Reply-To: <20170206151048.GK30506@linux.vnet.ibm.com>
On Mon, Feb 06, 2017 at 07:10:48AM -0800, Paul E. McKenney wrote:
> On Mon, Feb 06, 2017 at 11:53:10AM +0530, Sachin Sant wrote:
> >
> > >>> I've seen it on tip. It looks like hot unplug goes really slow when
> > >>> there's running tasks on the CPU being taken down.
> > >>>
> > >>> What I did was something like:
> > >>>
> > >>> taskset -p $((1<<1)) $$
> > >>> for ((i=0; i<20; i++)) do while :; do :; done & done
> > >>>
> > >>> taskset -p $((1<<0)) $$
> > >>> echo 0 > /sys/devices/system/cpu/cpu1/online
> > >>>
> > >>> And with those 20 tasks stuck sucking cycles on CPU1, the unplug goes
> > >>> _really_ slow and the RCU stall triggers. What I suspect happens is that
> > >>> hotplug stops participating in the RCU state machine early, but only
> > >>> tells RCU about it really late, and in between it gets suspicious it
> > >>> takes too long.
> > >>>
> > >>> I've yet to dig through the RCU code to figure out the exact sequence of
> > >>> events, but found the above to be fairly reliable in triggering the
> > >>> issue.
> > >
> > >> If you send me the full splat from the dmesg and the RCU portions of
> > >> .config, I will take a look. Is this new behavior, or a new test?
> > >
> >
> > I have sent the required files to you via separate email.
> >
> > > If new behavior, I would be most suspicious of these commits in -rcu which
> > > recently entered -tip:
> > >
> > > 19e4d983cda1 rcu: Place guard on rcu_all_qs() and rcu_note_context_switch() actions
> > > 913324b1364f rcu: Eliminate flavor scan in rcu_momentary_dyntick_idle()
> > > fcdcfefafa45 rcu: Pull rcu_qs_ctr into rcu_dynticks structure
> > > 0919a0b7e7a5 rcu: Pull rcu_sched_qs_mask into rcu_dynticks structure
> > > caa7c8e34293 rcu: Make rcu_note_context_switch() do deferred NOCB wakeups
> > > 41e4b159d516 rcu: Make rcu_all_qs() do deferred NOCB wakeups
> > > b457a3356a68 rcu: Make call_rcu() do deferred NOCB wakeups
> > >
> > > Does reverting any of these help?
> >
> > I tried reverting the above commits. That does not help. I can still recreate the issue.
>
> Thank you for testing, Sachin!
>
> Could you please try building and testing with CONFIG_RCU_BOOST=y?
> You will need to enable CONFIG_RCU_EXPERT=y to see this Kconfig option.
Ah, but looking ahead to your .config file, you have CONFIG_PREEMPT=n,
which means boosting would not help and is not available in any case.
So it looks like there is a very long loop within an RCU read-side
critical section, and that this critical section needs to be broken
up a bit -- 21 seconds in pretty much any kind of critical section is
a bit excessive, after all.
Thanx, Paul
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Paul E. McKenney @ 2017-02-06 15:10 UTC (permalink / raw)
To: Sachin Sant
Cc: Peter Zijlstra, Matt Fleming, linuxppc-dev@lists.ozlabs.org,
Mike Galbraith, LKML, linux-next@vger.kernel.org, Ross Zwisler
In-Reply-To: <45DC157B-EA1A-4E1C-9449-8DD317837FCB@linux.vnet.ibm.com>
On Mon, Feb 06, 2017 at 11:53:10AM +0530, Sachin Sant wrote:
>
> >>> I've seen it on tip. It looks like hot unplug goes really slow when
> >>> there's running tasks on the CPU being taken down.
> >>>
> >>> What I did was something like:
> >>>
> >>> taskset -p $((1<<1)) $$
> >>> for ((i=0; i<20; i++)) do while :; do :; done & done
> >>>
> >>> taskset -p $((1<<0)) $$
> >>> echo 0 > /sys/devices/system/cpu/cpu1/online
> >>>
> >>> And with those 20 tasks stuck sucking cycles on CPU1, the unplug goes
> >>> _really_ slow and the RCU stall triggers. What I suspect happens is that
> >>> hotplug stops participating in the RCU state machine early, but only
> >>> tells RCU about it really late, and in between it gets suspicious it
> >>> takes too long.
> >>>
> >>> I've yet to dig through the RCU code to figure out the exact sequence of
> >>> events, but found the above to be fairly reliable in triggering the
> >>> issue.
> >
> >> If you send me the full splat from the dmesg and the RCU portions of
> >> .config, I will take a look. Is this new behavior, or a new test?
> >
>
> I have sent the required files to you via separate email.
>
> > If new behavior, I would be most suspicious of these commits in -rcu which
> > recently entered -tip:
> >
> > 19e4d983cda1 rcu: Place guard on rcu_all_qs() and rcu_note_context_switch() actions
> > 913324b1364f rcu: Eliminate flavor scan in rcu_momentary_dyntick_idle()
> > fcdcfefafa45 rcu: Pull rcu_qs_ctr into rcu_dynticks structure
> > 0919a0b7e7a5 rcu: Pull rcu_sched_qs_mask into rcu_dynticks structure
> > caa7c8e34293 rcu: Make rcu_note_context_switch() do deferred NOCB wakeups
> > 41e4b159d516 rcu: Make rcu_all_qs() do deferred NOCB wakeups
> > b457a3356a68 rcu: Make call_rcu() do deferred NOCB wakeups
> >
> > Does reverting any of these help?
>
> I tried reverting the above commits. That does not help. I can still recreate the issue.
Thank you for testing, Sachin!
Could you please try building and testing with CONFIG_RCU_BOOST=y?
You will need to enable CONFIG_RCU_EXPERT=y to see this Kconfig option.
Thanx, Paul
^ permalink raw reply
* Re: linux-next: build failure after merge of the tty tree
From: Rob Herring @ 2017-02-06 14:09 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, linux-next, linux-kernel@vger.kernel.org,
Sebastian Reichel
In-Reply-To: <20170206085105.GB3726@kroah.com>
On Mon, Feb 6, 2017 at 2:51 AM, Greg KH <greg@kroah.com> wrote:
> On Mon, Feb 06, 2017 at 03:22:09PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> After merging the tty tree, today's linux-next build (x86_64 allmodconfig)
>> failed like this:
>>
>> ERROR: "of_device_uevent_modalias" [drivers/tty/serdev/serdev.ko] undefined!
>> ERROR: "of_device_get_modalias" [drivers/tty/serdev/serdev.ko] undefined!
>>
>> Caused by commit
>>
>> cd6484e1830b ("serdev: Introduce new bus for serial attached devices")
>>
>> I have used the tty tree from next-20170203 for today.
>
> Ugh, how has this been passing the 0-day bot builds succesfully?
>
> Rob, any ideas?
It didn't, but we happened to already have a fix queued up for 4.11.
The fix is in your usb-next branch:
commit 7a3b7cd332db08546f3cdd984f11773e0d1999e7
Author: Stephen Boyd <stephen.boyd@linaro.org>
Date: Wed Dec 28 14:56:48 2016 -0800
of: device: Export of_device_{get_modalias, uvent_modalias} to modules
The ULPI bus can be built as a module, and it will soon be
calling these functions when it supports probing devices from DT.
Export them so they can be used by the ULPI module.
Acked-by: Rob Herring <robh@kernel.org>
Cc: <devicetree@vger.kernel.org>
Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Rob
^ permalink raw reply
* Re: crypto: atmel - Fix authenc compile test warnings
From: kbuild test robot @ 2017-02-06 12:54 UTC (permalink / raw)
To: Herbert Xu
Cc: kbuild-all, Stephen Rothwell, linux-next, linux-kernel,
Cyrille Pitchen, Linux Crypto Mailing List
In-Reply-To: <20170206090340.GA9531@gondor.apana.org.au>
[-- Attachment #1: Type: text/plain, Size: 25982 bytes --]
Hi Herbert,
[auto build test WARNING on cryptodev/master]
[also build test WARNING on v4.10-rc7 next-20170206]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Herbert-Xu/crypto-atmel-Fix-authenc-compile-test-warnings/20170206-171201
base: https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git master
config: ia64-allmodconfig (attached as .config)
compiler: ia64-linux-gcc (GCC) 6.2.0
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=ia64
All warnings (new ones prefixed by >>):
In file included from drivers/crypto/atmel-tdes.c:17:0:
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_sg_copy':
include/linux/kernel.h:753:16: warning: comparison of distinct pointer types lacks a cast
(void) (&min1 == &min2); \
^
include/linux/kernel.h:756:2: note: in expansion of macro '__min'
__min(typeof(x), typeof(y), \
^~~~~
>> drivers/crypto/atmel-tdes.c:157:11: note: in expansion of macro 'min'
count = min(count, buflen);
^~~
In file included from include/linux/printk.h:6:0,
from include/linux/kernel.h:13,
from drivers/crypto/atmel-tdes.c:17:
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_crypt_pdc_stop':
>> include/linux/kern_levels.h:4:18: warning: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'size_t {aka long unsigned int}' [-Wformat=]
#define KERN_SOH "\001" /* ASCII Start Of Header */
^
include/linux/kern_levels.h:10:18: note: in expansion of macro 'KERN_SOH'
#define KERN_ERR KERN_SOH "3" /* error conditions */
^~~~~~~~
include/linux/printk.h:292:9: note: in expansion of macro 'KERN_ERR'
printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
^~~~~~~~
>> drivers/crypto/atmel-tdes.c:339:4: note: in expansion of macro 'pr_err'
pr_err("not all data converted: %u\n", count);
^~~~~~
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_buff_init':
>> drivers/crypto/atmel-tdes.c:364:26: warning: format '%d' expects argument of type 'int', but argument 3 has type 'size_t {aka long unsigned int}' [-Wformat=]
dev_err(dd->dev, "dma %d bytes error\n", dd->buflen);
^
drivers/crypto/atmel-tdes.c:372:26: warning: format '%d' expects argument of type 'int', but argument 3 has type 'size_t {aka long unsigned int}' [-Wformat=]
dev_err(dd->dev, "dma %d bytes error\n", dd->buflen);
^
In file included from drivers/crypto/atmel-tdes.c:17:0:
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_crypt_start':
include/linux/kernel.h:753:16: warning: comparison of distinct pointer types lacks a cast
(void) (&min1 == &min2); \
^
include/linux/kernel.h:756:2: note: in expansion of macro '__min'
__min(typeof(x), typeof(y), \
^~~~~
drivers/crypto/atmel-tdes.c:528:11: note: in expansion of macro 'min'
count = min(dd->total, sg_dma_len(dd->in_sg));
^~~
include/linux/kernel.h:753:16: warning: comparison of distinct pointer types lacks a cast
(void) (&min1 == &min2); \
^
include/linux/kernel.h:756:2: note: in expansion of macro '__min'
__min(typeof(x), typeof(y), \
^~~~~
drivers/crypto/atmel-tdes.c:529:11: note: in expansion of macro 'min'
count = min(count, sg_dma_len(dd->out_sg));
^~~
In file included from include/linux/printk.h:6:0,
from include/linux/kernel.h:13,
from drivers/crypto/atmel-tdes.c:17:
drivers/crypto/atmel-tdes.c: In function 'atmel_tdes_crypt_dma_stop':
>> include/linux/kern_levels.h:4:18: warning: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'size_t {aka long unsigned int}' [-Wformat=]
#define KERN_SOH "\001" /* ASCII Start Of Header */
^
include/linux/kern_levels.h:10:18: note: in expansion of macro 'KERN_SOH'
#define KERN_ERR KERN_SOH "3" /* error conditions */
^~~~~~~~
include/linux/printk.h:292:9: note: in expansion of macro 'KERN_ERR'
printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
^~~~~~~~
drivers/crypto/atmel-tdes.c:664:5: note: in expansion of macro 'pr_err'
pr_err("not all data converted: %u\n", count);
^~~~~~
vim +/min +157 drivers/crypto/atmel-tdes.c
13802005 Nicolas Royer 2012-07-01 11 * by the Free Software Foundation.
13802005 Nicolas Royer 2012-07-01 12 *
13802005 Nicolas Royer 2012-07-01 13 * Some ideas are from omap-aes.c drivers.
13802005 Nicolas Royer 2012-07-01 14 */
13802005 Nicolas Royer 2012-07-01 15
13802005 Nicolas Royer 2012-07-01 16
13802005 Nicolas Royer 2012-07-01 @17 #include <linux/kernel.h>
13802005 Nicolas Royer 2012-07-01 18 #include <linux/module.h>
13802005 Nicolas Royer 2012-07-01 19 #include <linux/slab.h>
13802005 Nicolas Royer 2012-07-01 20 #include <linux/err.h>
13802005 Nicolas Royer 2012-07-01 21 #include <linux/clk.h>
13802005 Nicolas Royer 2012-07-01 22 #include <linux/io.h>
13802005 Nicolas Royer 2012-07-01 23 #include <linux/hw_random.h>
13802005 Nicolas Royer 2012-07-01 24 #include <linux/platform_device.h>
13802005 Nicolas Royer 2012-07-01 25
13802005 Nicolas Royer 2012-07-01 26 #include <linux/device.h>
13802005 Nicolas Royer 2012-07-01 27 #include <linux/init.h>
13802005 Nicolas Royer 2012-07-01 28 #include <linux/errno.h>
13802005 Nicolas Royer 2012-07-01 29 #include <linux/interrupt.h>
13802005 Nicolas Royer 2012-07-01 30 #include <linux/irq.h>
13802005 Nicolas Royer 2012-07-01 31 #include <linux/scatterlist.h>
13802005 Nicolas Royer 2012-07-01 32 #include <linux/dma-mapping.h>
84c8976b Nicolas Ferre 2013-10-15 33 #include <linux/of_device.h>
13802005 Nicolas Royer 2012-07-01 34 #include <linux/delay.h>
13802005 Nicolas Royer 2012-07-01 35 #include <linux/crypto.h>
13802005 Nicolas Royer 2012-07-01 36 #include <linux/cryptohash.h>
13802005 Nicolas Royer 2012-07-01 37 #include <crypto/scatterwalk.h>
13802005 Nicolas Royer 2012-07-01 38 #include <crypto/algapi.h>
13802005 Nicolas Royer 2012-07-01 39 #include <crypto/des.h>
13802005 Nicolas Royer 2012-07-01 40 #include <crypto/hash.h>
13802005 Nicolas Royer 2012-07-01 41 #include <crypto/internal/hash.h>
1f858040 Nicolas Royer 2013-02-20 42 #include <linux/platform_data/crypto-atmel.h>
13802005 Nicolas Royer 2012-07-01 43 #include "atmel-tdes-regs.h"
13802005 Nicolas Royer 2012-07-01 44
13802005 Nicolas Royer 2012-07-01 45 /* TDES flags */
1f858040 Nicolas Royer 2013-02-20 46 #define TDES_FLAGS_MODE_MASK 0x00ff
13802005 Nicolas Royer 2012-07-01 47 #define TDES_FLAGS_ENCRYPT BIT(0)
13802005 Nicolas Royer 2012-07-01 48 #define TDES_FLAGS_CBC BIT(1)
13802005 Nicolas Royer 2012-07-01 49 #define TDES_FLAGS_CFB BIT(2)
13802005 Nicolas Royer 2012-07-01 50 #define TDES_FLAGS_CFB8 BIT(3)
13802005 Nicolas Royer 2012-07-01 51 #define TDES_FLAGS_CFB16 BIT(4)
13802005 Nicolas Royer 2012-07-01 52 #define TDES_FLAGS_CFB32 BIT(5)
1f858040 Nicolas Royer 2013-02-20 53 #define TDES_FLAGS_CFB64 BIT(6)
1f858040 Nicolas Royer 2013-02-20 54 #define TDES_FLAGS_OFB BIT(7)
13802005 Nicolas Royer 2012-07-01 55
13802005 Nicolas Royer 2012-07-01 56 #define TDES_FLAGS_INIT BIT(16)
13802005 Nicolas Royer 2012-07-01 57 #define TDES_FLAGS_FAST BIT(17)
13802005 Nicolas Royer 2012-07-01 58 #define TDES_FLAGS_BUSY BIT(18)
1f858040 Nicolas Royer 2013-02-20 59 #define TDES_FLAGS_DMA BIT(19)
13802005 Nicolas Royer 2012-07-01 60
1f858040 Nicolas Royer 2013-02-20 61 #define ATMEL_TDES_QUEUE_LENGTH 50
13802005 Nicolas Royer 2012-07-01 62
13802005 Nicolas Royer 2012-07-01 63 #define CFB8_BLOCK_SIZE 1
13802005 Nicolas Royer 2012-07-01 64 #define CFB16_BLOCK_SIZE 2
13802005 Nicolas Royer 2012-07-01 65 #define CFB32_BLOCK_SIZE 4
13802005 Nicolas Royer 2012-07-01 66
1f858040 Nicolas Royer 2013-02-20 67 struct atmel_tdes_caps {
1f858040 Nicolas Royer 2013-02-20 68 bool has_dma;
1f858040 Nicolas Royer 2013-02-20 69 u32 has_cfb_3keys;
1f858040 Nicolas Royer 2013-02-20 70 };
13802005 Nicolas Royer 2012-07-01 71
13802005 Nicolas Royer 2012-07-01 72 struct atmel_tdes_dev;
13802005 Nicolas Royer 2012-07-01 73
13802005 Nicolas Royer 2012-07-01 74 struct atmel_tdes_ctx {
13802005 Nicolas Royer 2012-07-01 75 struct atmel_tdes_dev *dd;
13802005 Nicolas Royer 2012-07-01 76
13802005 Nicolas Royer 2012-07-01 77 int keylen;
13802005 Nicolas Royer 2012-07-01 78 u32 key[3*DES_KEY_SIZE / sizeof(u32)];
13802005 Nicolas Royer 2012-07-01 79 unsigned long flags;
1f858040 Nicolas Royer 2013-02-20 80
1f858040 Nicolas Royer 2013-02-20 81 u16 block_size;
13802005 Nicolas Royer 2012-07-01 82 };
13802005 Nicolas Royer 2012-07-01 83
13802005 Nicolas Royer 2012-07-01 84 struct atmel_tdes_reqctx {
13802005 Nicolas Royer 2012-07-01 85 unsigned long mode;
13802005 Nicolas Royer 2012-07-01 86 };
13802005 Nicolas Royer 2012-07-01 87
1f858040 Nicolas Royer 2013-02-20 88 struct atmel_tdes_dma {
1f858040 Nicolas Royer 2013-02-20 89 struct dma_chan *chan;
1f858040 Nicolas Royer 2013-02-20 90 struct dma_slave_config dma_conf;
1f858040 Nicolas Royer 2013-02-20 91 };
1f858040 Nicolas Royer 2013-02-20 92
13802005 Nicolas Royer 2012-07-01 93 struct atmel_tdes_dev {
13802005 Nicolas Royer 2012-07-01 94 struct list_head list;
13802005 Nicolas Royer 2012-07-01 95 unsigned long phys_base;
13802005 Nicolas Royer 2012-07-01 96 void __iomem *io_base;
13802005 Nicolas Royer 2012-07-01 97
13802005 Nicolas Royer 2012-07-01 98 struct atmel_tdes_ctx *ctx;
13802005 Nicolas Royer 2012-07-01 99 struct device *dev;
13802005 Nicolas Royer 2012-07-01 100 struct clk *iclk;
13802005 Nicolas Royer 2012-07-01 101 int irq;
13802005 Nicolas Royer 2012-07-01 102
13802005 Nicolas Royer 2012-07-01 103 unsigned long flags;
13802005 Nicolas Royer 2012-07-01 104 int err;
13802005 Nicolas Royer 2012-07-01 105
13802005 Nicolas Royer 2012-07-01 106 spinlock_t lock;
13802005 Nicolas Royer 2012-07-01 107 struct crypto_queue queue;
13802005 Nicolas Royer 2012-07-01 108
13802005 Nicolas Royer 2012-07-01 109 struct tasklet_struct done_task;
13802005 Nicolas Royer 2012-07-01 110 struct tasklet_struct queue_task;
13802005 Nicolas Royer 2012-07-01 111
13802005 Nicolas Royer 2012-07-01 112 struct ablkcipher_request *req;
13802005 Nicolas Royer 2012-07-01 113 size_t total;
13802005 Nicolas Royer 2012-07-01 114
13802005 Nicolas Royer 2012-07-01 115 struct scatterlist *in_sg;
1f858040 Nicolas Royer 2013-02-20 116 unsigned int nb_in_sg;
13802005 Nicolas Royer 2012-07-01 117 size_t in_offset;
13802005 Nicolas Royer 2012-07-01 118 struct scatterlist *out_sg;
1f858040 Nicolas Royer 2013-02-20 119 unsigned int nb_out_sg;
13802005 Nicolas Royer 2012-07-01 120 size_t out_offset;
13802005 Nicolas Royer 2012-07-01 121
13802005 Nicolas Royer 2012-07-01 122 size_t buflen;
13802005 Nicolas Royer 2012-07-01 123 size_t dma_size;
13802005 Nicolas Royer 2012-07-01 124
13802005 Nicolas Royer 2012-07-01 125 void *buf_in;
13802005 Nicolas Royer 2012-07-01 126 int dma_in;
13802005 Nicolas Royer 2012-07-01 127 dma_addr_t dma_addr_in;
1f858040 Nicolas Royer 2013-02-20 128 struct atmel_tdes_dma dma_lch_in;
13802005 Nicolas Royer 2012-07-01 129
13802005 Nicolas Royer 2012-07-01 130 void *buf_out;
13802005 Nicolas Royer 2012-07-01 131 int dma_out;
13802005 Nicolas Royer 2012-07-01 132 dma_addr_t dma_addr_out;
1f858040 Nicolas Royer 2013-02-20 133 struct atmel_tdes_dma dma_lch_out;
1f858040 Nicolas Royer 2013-02-20 134
1f858040 Nicolas Royer 2013-02-20 135 struct atmel_tdes_caps caps;
1f858040 Nicolas Royer 2013-02-20 136
1f858040 Nicolas Royer 2013-02-20 137 u32 hw_version;
13802005 Nicolas Royer 2012-07-01 138 };
13802005 Nicolas Royer 2012-07-01 139
13802005 Nicolas Royer 2012-07-01 140 struct atmel_tdes_drv {
13802005 Nicolas Royer 2012-07-01 141 struct list_head dev_list;
13802005 Nicolas Royer 2012-07-01 142 spinlock_t lock;
13802005 Nicolas Royer 2012-07-01 143 };
13802005 Nicolas Royer 2012-07-01 144
13802005 Nicolas Royer 2012-07-01 145 static struct atmel_tdes_drv atmel_tdes = {
13802005 Nicolas Royer 2012-07-01 146 .dev_list = LIST_HEAD_INIT(atmel_tdes.dev_list),
13802005 Nicolas Royer 2012-07-01 147 .lock = __SPIN_LOCK_UNLOCKED(atmel_tdes.lock),
13802005 Nicolas Royer 2012-07-01 148 };
13802005 Nicolas Royer 2012-07-01 149
13802005 Nicolas Royer 2012-07-01 150 static int atmel_tdes_sg_copy(struct scatterlist **sg, size_t *offset,
13802005 Nicolas Royer 2012-07-01 151 void *buf, size_t buflen, size_t total, int out)
13802005 Nicolas Royer 2012-07-01 152 {
13802005 Nicolas Royer 2012-07-01 153 unsigned int count, off = 0;
13802005 Nicolas Royer 2012-07-01 154
13802005 Nicolas Royer 2012-07-01 155 while (buflen && total) {
13802005 Nicolas Royer 2012-07-01 156 count = min((*sg)->length - *offset, total);
13802005 Nicolas Royer 2012-07-01 @157 count = min(count, buflen);
13802005 Nicolas Royer 2012-07-01 158
13802005 Nicolas Royer 2012-07-01 159 if (!count)
13802005 Nicolas Royer 2012-07-01 160 return off;
13802005 Nicolas Royer 2012-07-01 161
13802005 Nicolas Royer 2012-07-01 162 scatterwalk_map_and_copy(buf + off, *sg, *offset, count, out);
13802005 Nicolas Royer 2012-07-01 163
13802005 Nicolas Royer 2012-07-01 164 off += count;
13802005 Nicolas Royer 2012-07-01 165 buflen -= count;
13802005 Nicolas Royer 2012-07-01 166 *offset += count;
13802005 Nicolas Royer 2012-07-01 167 total -= count;
13802005 Nicolas Royer 2012-07-01 168
13802005 Nicolas Royer 2012-07-01 169 if (*offset == (*sg)->length) {
13802005 Nicolas Royer 2012-07-01 170 *sg = sg_next(*sg);
13802005 Nicolas Royer 2012-07-01 171 if (*sg)
13802005 Nicolas Royer 2012-07-01 172 *offset = 0;
13802005 Nicolas Royer 2012-07-01 173 else
13802005 Nicolas Royer 2012-07-01 174 total = 0;
13802005 Nicolas Royer 2012-07-01 175 }
13802005 Nicolas Royer 2012-07-01 176 }
13802005 Nicolas Royer 2012-07-01 177
13802005 Nicolas Royer 2012-07-01 178 return off;
13802005 Nicolas Royer 2012-07-01 179 }
13802005 Nicolas Royer 2012-07-01 180
13802005 Nicolas Royer 2012-07-01 181 static inline u32 atmel_tdes_read(struct atmel_tdes_dev *dd, u32 offset)
13802005 Nicolas Royer 2012-07-01 182 {
13802005 Nicolas Royer 2012-07-01 183 return readl_relaxed(dd->io_base + offset);
13802005 Nicolas Royer 2012-07-01 184 }
13802005 Nicolas Royer 2012-07-01 185
13802005 Nicolas Royer 2012-07-01 186 static inline void atmel_tdes_write(struct atmel_tdes_dev *dd,
13802005 Nicolas Royer 2012-07-01 187 u32 offset, u32 value)
13802005 Nicolas Royer 2012-07-01 188 {
13802005 Nicolas Royer 2012-07-01 189 writel_relaxed(value, dd->io_base + offset);
13802005 Nicolas Royer 2012-07-01 190 }
13802005 Nicolas Royer 2012-07-01 191
13802005 Nicolas Royer 2012-07-01 192 static void atmel_tdes_write_n(struct atmel_tdes_dev *dd, u32 offset,
13802005 Nicolas Royer 2012-07-01 193 u32 *value, int count)
13802005 Nicolas Royer 2012-07-01 194 {
13802005 Nicolas Royer 2012-07-01 195 for (; count--; value++, offset += 4)
13802005 Nicolas Royer 2012-07-01 196 atmel_tdes_write(dd, offset, *value);
13802005 Nicolas Royer 2012-07-01 197 }
13802005 Nicolas Royer 2012-07-01 198
13802005 Nicolas Royer 2012-07-01 199 static struct atmel_tdes_dev *atmel_tdes_find_dev(struct atmel_tdes_ctx *ctx)
13802005 Nicolas Royer 2012-07-01 200 {
13802005 Nicolas Royer 2012-07-01 201 struct atmel_tdes_dev *tdes_dd = NULL;
13802005 Nicolas Royer 2012-07-01 202 struct atmel_tdes_dev *tmp;
13802005 Nicolas Royer 2012-07-01 203
13802005 Nicolas Royer 2012-07-01 204 spin_lock_bh(&atmel_tdes.lock);
13802005 Nicolas Royer 2012-07-01 205 if (!ctx->dd) {
13802005 Nicolas Royer 2012-07-01 206 list_for_each_entry(tmp, &atmel_tdes.dev_list, list) {
13802005 Nicolas Royer 2012-07-01 207 tdes_dd = tmp;
13802005 Nicolas Royer 2012-07-01 208 break;
13802005 Nicolas Royer 2012-07-01 209 }
13802005 Nicolas Royer 2012-07-01 210 ctx->dd = tdes_dd;
13802005 Nicolas Royer 2012-07-01 211 } else {
13802005 Nicolas Royer 2012-07-01 212 tdes_dd = ctx->dd;
13802005 Nicolas Royer 2012-07-01 213 }
13802005 Nicolas Royer 2012-07-01 214 spin_unlock_bh(&atmel_tdes.lock);
13802005 Nicolas Royer 2012-07-01 215
13802005 Nicolas Royer 2012-07-01 216 return tdes_dd;
13802005 Nicolas Royer 2012-07-01 217 }
13802005 Nicolas Royer 2012-07-01 218
13802005 Nicolas Royer 2012-07-01 219 static int atmel_tdes_hw_init(struct atmel_tdes_dev *dd)
13802005 Nicolas Royer 2012-07-01 220 {
9d83d299 LABBE Corentin 2015-10-02 221 int err;
9d83d299 LABBE Corentin 2015-10-02 222
9d83d299 LABBE Corentin 2015-10-02 223 err = clk_prepare_enable(dd->iclk);
9d83d299 LABBE Corentin 2015-10-02 224 if (err)
9d83d299 LABBE Corentin 2015-10-02 225 return err;
13802005 Nicolas Royer 2012-07-01 226
13802005 Nicolas Royer 2012-07-01 227 if (!(dd->flags & TDES_FLAGS_INIT)) {
13802005 Nicolas Royer 2012-07-01 228 atmel_tdes_write(dd, TDES_CR, TDES_CR_SWRST);
13802005 Nicolas Royer 2012-07-01 229 dd->flags |= TDES_FLAGS_INIT;
13802005 Nicolas Royer 2012-07-01 230 dd->err = 0;
13802005 Nicolas Royer 2012-07-01 231 }
13802005 Nicolas Royer 2012-07-01 232
13802005 Nicolas Royer 2012-07-01 233 return 0;
13802005 Nicolas Royer 2012-07-01 234 }
13802005 Nicolas Royer 2012-07-01 235
1f858040 Nicolas Royer 2013-02-20 236 static inline unsigned int atmel_tdes_get_version(struct atmel_tdes_dev *dd)
1f858040 Nicolas Royer 2013-02-20 237 {
1f858040 Nicolas Royer 2013-02-20 238 return atmel_tdes_read(dd, TDES_HW_VERSION) & 0x00000fff;
1f858040 Nicolas Royer 2013-02-20 239 }
1f858040 Nicolas Royer 2013-02-20 240
1f858040 Nicolas Royer 2013-02-20 241 static void atmel_tdes_hw_version_init(struct atmel_tdes_dev *dd)
1f858040 Nicolas Royer 2013-02-20 242 {
1f858040 Nicolas Royer 2013-02-20 243 atmel_tdes_hw_init(dd);
1f858040 Nicolas Royer 2013-02-20 244
1f858040 Nicolas Royer 2013-02-20 245 dd->hw_version = atmel_tdes_get_version(dd);
1f858040 Nicolas Royer 2013-02-20 246
1f858040 Nicolas Royer 2013-02-20 247 dev_info(dd->dev,
1f858040 Nicolas Royer 2013-02-20 248 "version: 0x%x\n", dd->hw_version);
1f858040 Nicolas Royer 2013-02-20 249
1f858040 Nicolas Royer 2013-02-20 250 clk_disable_unprepare(dd->iclk);
1f858040 Nicolas Royer 2013-02-20 251 }
1f858040 Nicolas Royer 2013-02-20 252
1f858040 Nicolas Royer 2013-02-20 253 static void atmel_tdes_dma_callback(void *data)
1f858040 Nicolas Royer 2013-02-20 254 {
1f858040 Nicolas Royer 2013-02-20 255 struct atmel_tdes_dev *dd = data;
1f858040 Nicolas Royer 2013-02-20 256
1f858040 Nicolas Royer 2013-02-20 257 /* dma_lch_out - completed */
1f858040 Nicolas Royer 2013-02-20 258 tasklet_schedule(&dd->done_task);
1f858040 Nicolas Royer 2013-02-20 259 }
1f858040 Nicolas Royer 2013-02-20 260
13802005 Nicolas Royer 2012-07-01 261 static int atmel_tdes_write_ctrl(struct atmel_tdes_dev *dd)
13802005 Nicolas Royer 2012-07-01 262 {
13802005 Nicolas Royer 2012-07-01 263 int err;
13802005 Nicolas Royer 2012-07-01 264 u32 valcr = 0, valmr = TDES_MR_SMOD_PDC;
13802005 Nicolas Royer 2012-07-01 265
13802005 Nicolas Royer 2012-07-01 266 err = atmel_tdes_hw_init(dd);
13802005 Nicolas Royer 2012-07-01 267
13802005 Nicolas Royer 2012-07-01 268 if (err)
13802005 Nicolas Royer 2012-07-01 269 return err;
13802005 Nicolas Royer 2012-07-01 270
1f858040 Nicolas Royer 2013-02-20 271 if (!dd->caps.has_dma)
1f858040 Nicolas Royer 2013-02-20 272 atmel_tdes_write(dd, TDES_PTCR,
1f858040 Nicolas Royer 2013-02-20 273 TDES_PTCR_TXTDIS | TDES_PTCR_RXTDIS);
13802005 Nicolas Royer 2012-07-01 274
13802005 Nicolas Royer 2012-07-01 275 /* MR register must be set before IV registers */
13802005 Nicolas Royer 2012-07-01 276 if (dd->ctx->keylen > (DES_KEY_SIZE << 1)) {
13802005 Nicolas Royer 2012-07-01 277 valmr |= TDES_MR_KEYMOD_3KEY;
13802005 Nicolas Royer 2012-07-01 278 valmr |= TDES_MR_TDESMOD_TDES;
13802005 Nicolas Royer 2012-07-01 279 } else if (dd->ctx->keylen > DES_KEY_SIZE) {
13802005 Nicolas Royer 2012-07-01 280 valmr |= TDES_MR_KEYMOD_2KEY;
13802005 Nicolas Royer 2012-07-01 281 valmr |= TDES_MR_TDESMOD_TDES;
13802005 Nicolas Royer 2012-07-01 282 } else {
13802005 Nicolas Royer 2012-07-01 283 valmr |= TDES_MR_TDESMOD_DES;
13802005 Nicolas Royer 2012-07-01 284 }
13802005 Nicolas Royer 2012-07-01 285
13802005 Nicolas Royer 2012-07-01 286 if (dd->flags & TDES_FLAGS_CBC) {
13802005 Nicolas Royer 2012-07-01 287 valmr |= TDES_MR_OPMOD_CBC;
13802005 Nicolas Royer 2012-07-01 288 } else if (dd->flags & TDES_FLAGS_CFB) {
13802005 Nicolas Royer 2012-07-01 289 valmr |= TDES_MR_OPMOD_CFB;
13802005 Nicolas Royer 2012-07-01 290
13802005 Nicolas Royer 2012-07-01 291 if (dd->flags & TDES_FLAGS_CFB8)
13802005 Nicolas Royer 2012-07-01 292 valmr |= TDES_MR_CFBS_8b;
13802005 Nicolas Royer 2012-07-01 293 else if (dd->flags & TDES_FLAGS_CFB16)
13802005 Nicolas Royer 2012-07-01 294 valmr |= TDES_MR_CFBS_16b;
13802005 Nicolas Royer 2012-07-01 295 else if (dd->flags & TDES_FLAGS_CFB32)
13802005 Nicolas Royer 2012-07-01 296 valmr |= TDES_MR_CFBS_32b;
1f858040 Nicolas Royer 2013-02-20 297 else if (dd->flags & TDES_FLAGS_CFB64)
1f858040 Nicolas Royer 2013-02-20 298 valmr |= TDES_MR_CFBS_64b;
13802005 Nicolas Royer 2012-07-01 299 } else if (dd->flags & TDES_FLAGS_OFB) {
13802005 Nicolas Royer 2012-07-01 300 valmr |= TDES_MR_OPMOD_OFB;
13802005 Nicolas Royer 2012-07-01 301 }
13802005 Nicolas Royer 2012-07-01 302
13802005 Nicolas Royer 2012-07-01 303 if ((dd->flags & TDES_FLAGS_ENCRYPT) || (dd->flags & TDES_FLAGS_OFB))
13802005 Nicolas Royer 2012-07-01 304 valmr |= TDES_MR_CYPHER_ENC;
13802005 Nicolas Royer 2012-07-01 305
13802005 Nicolas Royer 2012-07-01 306 atmel_tdes_write(dd, TDES_CR, valcr);
13802005 Nicolas Royer 2012-07-01 307 atmel_tdes_write(dd, TDES_MR, valmr);
13802005 Nicolas Royer 2012-07-01 308
13802005 Nicolas Royer 2012-07-01 309 atmel_tdes_write_n(dd, TDES_KEY1W1R, dd->ctx->key,
13802005 Nicolas Royer 2012-07-01 310 dd->ctx->keylen >> 2);
13802005 Nicolas Royer 2012-07-01 311
13802005 Nicolas Royer 2012-07-01 312 if (((dd->flags & TDES_FLAGS_CBC) || (dd->flags & TDES_FLAGS_CFB) ||
13802005 Nicolas Royer 2012-07-01 313 (dd->flags & TDES_FLAGS_OFB)) && dd->req->info) {
13802005 Nicolas Royer 2012-07-01 314 atmel_tdes_write_n(dd, TDES_IV1R, dd->req->info, 2);
13802005 Nicolas Royer 2012-07-01 315 }
13802005 Nicolas Royer 2012-07-01 316
13802005 Nicolas Royer 2012-07-01 317 return 0;
13802005 Nicolas Royer 2012-07-01 318 }
13802005 Nicolas Royer 2012-07-01 319
1f858040 Nicolas Royer 2013-02-20 320 static int atmel_tdes_crypt_pdc_stop(struct atmel_tdes_dev *dd)
13802005 Nicolas Royer 2012-07-01 321 {
13802005 Nicolas Royer 2012-07-01 322 int err = 0;
13802005 Nicolas Royer 2012-07-01 323 size_t count;
13802005 Nicolas Royer 2012-07-01 324
13802005 Nicolas Royer 2012-07-01 325 atmel_tdes_write(dd, TDES_PTCR, TDES_PTCR_TXTDIS|TDES_PTCR_RXTDIS);
13802005 Nicolas Royer 2012-07-01 326
13802005 Nicolas Royer 2012-07-01 327 if (dd->flags & TDES_FLAGS_FAST) {
13802005 Nicolas Royer 2012-07-01 328 dma_unmap_sg(dd->dev, dd->out_sg, 1, DMA_FROM_DEVICE);
13802005 Nicolas Royer 2012-07-01 329 dma_unmap_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE);
13802005 Nicolas Royer 2012-07-01 330 } else {
13802005 Nicolas Royer 2012-07-01 331 dma_sync_single_for_device(dd->dev, dd->dma_addr_out,
13802005 Nicolas Royer 2012-07-01 332 dd->dma_size, DMA_FROM_DEVICE);
13802005 Nicolas Royer 2012-07-01 333
13802005 Nicolas Royer 2012-07-01 334 /* copy data */
13802005 Nicolas Royer 2012-07-01 335 count = atmel_tdes_sg_copy(&dd->out_sg, &dd->out_offset,
13802005 Nicolas Royer 2012-07-01 336 dd->buf_out, dd->buflen, dd->dma_size, 1);
13802005 Nicolas Royer 2012-07-01 337 if (count != dd->dma_size) {
13802005 Nicolas Royer 2012-07-01 338 err = -EINVAL;
13802005 Nicolas Royer 2012-07-01 @339 pr_err("not all data converted: %u\n", count);
13802005 Nicolas Royer 2012-07-01 340 }
13802005 Nicolas Royer 2012-07-01 341 }
13802005 Nicolas Royer 2012-07-01 342
:::::: The code at line 157 was first introduced by commit
:::::: 13802005d8f2db244ec1f5d7f6923de8f7a463db crypto: atmel - add Atmel DES/TDES driver
:::::: TO: Nicolas Royer <nicolas@eukrea.com>
:::::: CC: Herbert Xu <herbert@gondor.apana.org.au>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 45911 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the arm64 tree with the qcom tree
From: Will Deacon @ 2017-02-06 11:44 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Catalin Marinas, Andy Gross, linux-next, linux-kernel
In-Reply-To: <20170206102329.04879df9@canb.auug.org.au>
On Mon, Feb 06, 2017 at 10:23:29AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm64 tree got conflicts in:
>
> arch/arm/kernel/armksyms.c
> arch/arm64/kernel/arm64ksyms.c
> arch/arm64/kernel/smccc-call.S
> include/linux/arm-smccc.h
>
> between commits:
>
> 0a0c5b832751 ("arm: kernel: Add SMC structure parameter")
> 9c96e7f72029 ("firmware: qcom: scm: Fix interrupted SCM calls")
>
> from the qcom tree and commits:
>
> 680a0873e193 ("arm: kernel: Add SMC structure parameter")
> 82bcd087029f ("firmware: qcom: scm: Fix interrupted SCM calls")
>
> from the arm64 tree.
>
> I fixed it up (please check the final resolution when it is released,
> or fix these up) 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.
Thanks Stephen, although if looks like you've resolved the conflict to
be what is in the qcom tree, which is in fact an earlier version of this
patch series.
Andy, please can you drop your stuff from -next now that a newer version
is queued via arm64? (and also please check that you're happy with what
I've got queued).
Thanks,
Will
^ permalink raw reply
* next-20170206 build: 2 failures 16 warnings (next-20170206)
From: Build bot for Mark Brown @ 2017-02-06 11:02 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170206
Git describe: next-20170206
Commit: ce05054690 Add linux-next specific files for 20170206
Build Time: 108 min 11 sec
Passed: 8 / 10 ( 80.00 %)
Failed: 2 / 10 ( 20.00 %)
Errors: 2
Warnings: 16
Section Mismatches: 0
Failed defconfigs:
arm-allnoconfig
Errors:
arm-allnoconfig
../mm/nommu.c:1201:15: error: conflicting types for 'do_mmap'
../mm/nommu.c:1580:5: error: conflicting types for 'do_munmap'
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : x86_64-allnoconfig
1 warnings 0 mismatches : arm64-allnoconfig
11 warnings 0 mismatches : arm64-allmodconfig
1 warnings 0 mismatches : arm-allnoconfig
6 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Errors summary: 2
1 ../mm/nommu.c:1580:5: error: conflicting types for 'do_munmap'
1 ../mm/nommu.c:1201:15: error: conflicting types for 'do_mmap'
Warnings Summary: 16
3 warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91)
3 ../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
1 ../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:814:40: warning: 'out_dev' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:429:27: warning: 'num_channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:428:23: warning: 'channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:426:22: warning: 'sample_width' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:398:26: warning: 'adcmode' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/crypto/atmel-sha.c:997:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
1 ../drivers/crypto/atmel-sha.c:817:27: warning: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'size_t {aka long unsigned int}' [-Wformat=]
1 ../drivers/crypto/atmel-sha.c:775:19: warning: format '%u' expects argument of type 'unsigned int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
1 ../drivers/crypto/atmel-sha.c:747:19: warning: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'size_t {aka long unsigned int}' [-Wformat=]
1 ../drivers/crypto/atmel-sha.c:726:26: warning: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'size_t {aka long unsigned int}' [-Wformat=]
1 ../drivers/crypto/atmel-sha.c:647:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
1 ../drivers/crypto/atmel-sha.c:600:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
1 ../drivers/crypto/atmel-sha.c:571:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
x86_64-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 11 warnings, 0 section mismatches
Warnings:
warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91)
warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91)
warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91)
../drivers/crypto/atmel-sha.c:571:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
../drivers/crypto/atmel-sha.c:600:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
../drivers/crypto/atmel-sha.c:647:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
../drivers/crypto/atmel-sha.c:726:26: warning: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'size_t {aka long unsigned int}' [-Wformat=]
../drivers/crypto/atmel-sha.c:747:19: warning: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'size_t {aka long unsigned int}' [-Wformat=]
../drivers/crypto/atmel-sha.c:775:19: warning: format '%u' expects argument of type 'unsigned int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
../drivers/crypto/atmel-sha.c:817:27: warning: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'size_t {aka long unsigned int}' [-Wformat=]
../drivers/crypto/atmel-sha.c:997:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
-------------------------------------------------------------------------------
arm-allnoconfig : FAIL, 2 errors, 1 warnings, 0 section mismatches
Errors:
../mm/nommu.c:1201:15: error: conflicting types for 'do_mmap'
../mm/nommu.c:1580:5: error: conflicting types for 'do_munmap'
Warnings:
../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
../drivers/iio/adc/rcar-gyroadc.c:429:27: warning: 'num_channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:426:22: warning: 'sample_width' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:428:23: warning: 'channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:398:26: warning: 'adcmode' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:814:40: warning: 'out_dev' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm-multi_v4t_defconfig
x86_64-defconfig
arm-multi_v7_defconfig
arm-multi_v5_defconfig
arm64-defconfig
^ permalink raw reply
* Re: linux-next: build warnings after merge of the crypto tree
From: Cyrille Pitchen @ 2017-02-06 10:15 UTC (permalink / raw)
To: Stephen Rothwell, Herbert Xu; +Cc: linux-next, linux-kernel
In-Reply-To: <20170206122837.0226fb89@canb.auug.org.au>
Hi all,
Le 06/02/2017 à 02:28, Stephen Rothwell a écrit :
> Hi Herbert,
>
> After merging the crypto tree, today's linux-next build (x86_64
> allmodconfig) produced these warnings:
>
> warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91)
> warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91)
>
> Introduced by commit
>
> 89a82ef87e01 ("crypto: atmel-authenc - add support to authenc(hmac(shaX), Y(aes)) modes")
>
> In file included from include/linux/printk.h:329:0,
> from include/linux/kernel.h:13,
> from drivers/crypto/atmel-sha.c:17:
> drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_cpu':
> drivers/crypto/atmel-sha.c:571:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
> dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n",
> ^
> include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg'
> __dynamic_dev_dbg(&descriptor, dev, fmt, \
> ^
> drivers/crypto/atmel-sha.c:571:2: note: in expansion of macro 'dev_dbg'
> dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n",
> ^
> drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_pdc':
> drivers/crypto/atmel-sha.c:600:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
> dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n",
> ^
> include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg'
> __dynamic_dev_dbg(&descriptor, dev, fmt, \
> ^
> drivers/crypto/atmel-sha.c:600:2: note: in expansion of macro 'dev_dbg'
> dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n",
> ^
> drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_dma':
> drivers/crypto/atmel-sha.c:647:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
> dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n",
> ^
> include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg'
> __dynamic_dev_dbg(&descriptor, dev, fmt, \
> ^
> drivers/crypto/atmel-sha.c:647:2: note: in expansion of macro 'dev_dbg'
> dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n",
> ^
> drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_dma_map':
> drivers/crypto/atmel-sha.c:726:20: warning: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'size_t {aka long unsigned int}' [-Wformat=]
> dev_err(dd->dev, "dma %u bytes error\n", ctx->buflen +
> ^
> In file included from include/linux/printk.h:329:0,
> from include/linux/kernel.h:13,
> from drivers/crypto/atmel-sha.c:17:
> drivers/crypto/atmel-sha.c: In function 'atmel_sha_update_dma_slow':
> drivers/crypto/atmel-sha.c:747:19: warning: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'size_t {aka long unsigned int}' [-Wformat=]
> dev_dbg(dd->dev, "slow: bufcnt: %u, digcnt: 0x%llx 0x%llx, final: %d\n",
> ^
> include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg'
> __dynamic_dev_dbg(&descriptor, dev, fmt, \
> ^
> drivers/crypto/atmel-sha.c:747:2: note: in expansion of macro 'dev_dbg'
> dev_dbg(dd->dev, "slow: bufcnt: %u, digcnt: 0x%llx 0x%llx, final: %d\n",
> ^
> drivers/crypto/atmel-sha.c: In function 'atmel_sha_update_dma_start':
> drivers/crypto/atmel-sha.c:775:19: warning: format '%u' expects argument of type 'unsigned int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
> dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %u, total: %u\n",
> ^
> include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg'
> __dynamic_dev_dbg(&descriptor, dev, fmt, \
> ^
> drivers/crypto/atmel-sha.c:775:2: note: in expansion of macro 'dev_dbg'
> dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %u, total: %u\n",
> ^
> drivers/crypto/atmel-sha.c:817:21: warning: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'size_t {aka long unsigned int}' [-Wformat=]
> dev_err(dd->dev, "dma %u bytes error\n",
> ^
> In file included from include/linux/printk.h:329:0,
> from include/linux/kernel.h:13,
> from drivers/crypto/atmel-sha.c:17:
> drivers/crypto/atmel-sha.c: In function 'atmel_sha_finish':
> drivers/crypto/atmel-sha.c:997:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=]
> dev_dbg(dd->dev, "digcnt: 0x%llx 0x%llx, bufcnt: %d\n", ctx->digcnt[1],
> ^
> include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg'
> __dynamic_dev_dbg(&descriptor, dev, fmt, \
> ^
> drivers/crypto/atmel-sha.c:997:2: note: in expansion of macro 'dev_dbg'
> dev_dbg(dd->dev, "digcnt: 0x%llx 0x%llx, bufcnt: %d\n", ctx->digcnt[1],
> ^
>
> I am not sure what caused this, but it may be that this code has not
> been built for this platform before?
>
Indeed, the drivers/crypto/atmel-sha.c driver has never been built for x86_64.
CRYPTO_DEV_ATMEL_AUTHENC must select both CRYPTO_DEV_ATMEL_AES and
CRYPTO_DEV_ATMEL_SHA. I thought I could add a dependency to COMPILE_TEST
for CRYPTO_DEV_ATMEL_AUTHENC since CRYPTO_DEV_ATMEL_AES already had such a
dependency, hence could be compiled on architectures other than AT91 but I
didn't check the same for CRYPTO_DEV_ATMEL_SHA.
So maybe the easiest solution could be to remove the COMPILE_TEST
dependency on CRYPTO_DEV_ATMEL_AUTHENC for now, then I could try to fix all
these dev_dbg() format strings to make them become cross-platform compliant.
Herbert, if you think this solution is suitable I can prepare a first patch
to remove the COMPILE_TEST dependency on CRYPTO_DEV_ATMEL_AUTHENC.
Best regards,
Cyrille
^ permalink raw reply
* Re: linux-next: build warnings after merge of the crypto tree
From: Herbert Xu @ 2017-02-06 9:03 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Cyrille Pitchen,
Linux Crypto Mailing List
In-Reply-To: <20170206122837.0226fb89@canb.auug.org.au>
Hi Stephen:
On Mon, Feb 06, 2017 at 12:28:37PM +1100, Stephen Rothwell wrote:
>
> After merging the crypto tree, today's linux-next build (x86_64
> allmodconfig) produced these warnings:
>
> warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91)
> warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91)
>
> Introduced by commit
>
> 89a82ef87e01 ("crypto: atmel-authenc - add support to authenc(hmac(shaX), Y(aes)) modes")
>
> In file included from include/linux/printk.h:329:0,
> from include/linux/kernel.h:13,
> from drivers/crypto/atmel-sha.c:17:
This patch should fix both issues. Thanks,
---8<---
Subject: crypto: atmel - Fix authenc compile test warnings
The authenc code depends on the sha code so in order to allow
compile testing on the former we must allow it on sha as well.
This patch enables compile testing on sha as well as tdes and
fixes the few x86-64 warnings that arise in the sha code.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 7482461..9b7e19e 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -444,7 +444,7 @@ config CRYPTO_DEV_ATMEL_AES
config CRYPTO_DEV_ATMEL_TDES
tristate "Support for Atmel DES/TDES hw accelerator"
- depends on ARCH_AT91
+ depends on ARCH_AT91 || COMPILE_TEST
select CRYPTO_DES
select CRYPTO_BLKCIPHER
help
@@ -457,7 +457,7 @@ config CRYPTO_DEV_ATMEL_TDES
config CRYPTO_DEV_ATMEL_SHA
tristate "Support for Atmel SHA hw accelerator"
- depends on ARCH_AT91
+ depends on ARCH_AT91 || COMPILE_TEST
select CRYPTO_HASH
help
Some Atmel processors have SHA1/SHA224/SHA256/SHA384/SHA512
diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c
index 22d0c0c..b081e78 100644
--- a/drivers/crypto/atmel-sha.c
+++ b/drivers/crypto/atmel-sha.c
@@ -568,7 +568,7 @@ static int atmel_sha_xmit_cpu(struct atmel_sha_dev *dd, const u8 *buf,
int count, len32;
const u32 *buffer = (const u32 *)buf;
- dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n",
+ dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %zu, final: %d\n",
ctx->digcnt[1], ctx->digcnt[0], length, final);
atmel_sha_write_ctrl(dd, 0);
@@ -597,7 +597,7 @@ static int atmel_sha_xmit_pdc(struct atmel_sha_dev *dd, dma_addr_t dma_addr1,
struct atmel_sha_reqctx *ctx = ahash_request_ctx(dd->req);
int len32;
- dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n",
+ dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %zu, final: %d\n",
ctx->digcnt[1], ctx->digcnt[0], length1, final);
len32 = DIV_ROUND_UP(length1, sizeof(u32));
@@ -644,7 +644,7 @@ static int atmel_sha_xmit_dma(struct atmel_sha_dev *dd, dma_addr_t dma_addr1,
struct dma_async_tx_descriptor *in_desc;
struct scatterlist sg[2];
- dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n",
+ dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %zu, final: %d\n",
ctx->digcnt[1], ctx->digcnt[0], length1, final);
dd->dma_lch_in.dma_conf.src_maxburst = 16;
@@ -723,7 +723,7 @@ static int atmel_sha_xmit_dma_map(struct atmel_sha_dev *dd,
ctx->dma_addr = dma_map_single(dd->dev, ctx->buffer,
ctx->buflen + ctx->block_size, DMA_TO_DEVICE);
if (dma_mapping_error(dd->dev, ctx->dma_addr)) {
- dev_err(dd->dev, "dma %u bytes error\n", ctx->buflen +
+ dev_err(dd->dev, "dma %zu bytes error\n", ctx->buflen +
ctx->block_size);
atmel_sha_complete(dd, -EINVAL);
}
@@ -744,7 +744,7 @@ static int atmel_sha_update_dma_slow(struct atmel_sha_dev *dd)
final = (ctx->flags & SHA_FLAGS_FINUP) && !ctx->total;
- dev_dbg(dd->dev, "slow: bufcnt: %u, digcnt: 0x%llx 0x%llx, final: %d\n",
+ dev_dbg(dd->dev, "slow: bufcnt: %zu, digcnt: 0x%llx 0x%llx, final: %d\n",
ctx->bufcnt, ctx->digcnt[1], ctx->digcnt[0], final);
if (final)
@@ -772,7 +772,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd)
if (ctx->bufcnt || ctx->offset)
return atmel_sha_update_dma_slow(dd);
- dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %u, total: %u\n",
+ dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %zu, total: %u\n",
ctx->digcnt[1], ctx->digcnt[0], ctx->bufcnt, ctx->total);
sg = ctx->sg;
@@ -814,7 +814,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd)
ctx->dma_addr = dma_map_single(dd->dev, ctx->buffer,
ctx->buflen + ctx->block_size, DMA_TO_DEVICE);
if (dma_mapping_error(dd->dev, ctx->dma_addr)) {
- dev_err(dd->dev, "dma %u bytes error\n",
+ dev_err(dd->dev, "dma %zu bytes error\n",
ctx->buflen + ctx->block_size);
atmel_sha_complete(dd, -EINVAL);
}
@@ -994,7 +994,7 @@ static int atmel_sha_finish(struct ahash_request *req)
if (ctx->digcnt[0] || ctx->digcnt[1])
atmel_sha_copy_ready_hash(req);
- dev_dbg(dd->dev, "digcnt: 0x%llx 0x%llx, bufcnt: %d\n", ctx->digcnt[1],
+ dev_dbg(dd->dev, "digcnt: 0x%llx 0x%llx, bufcnt: %zu\n", ctx->digcnt[1],
ctx->digcnt[0], ctx->bufcnt);
return 0;
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply related
* Re: linux-next: build failure after merge of the tty tree
From: Greg KH @ 2017-02-06 8:51 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Rob Herring, Sebastian Reichel
In-Reply-To: <20170206152209.0819e332@canb.auug.org.au>
On Mon, Feb 06, 2017 at 03:22:09PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> After merging the tty tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> ERROR: "of_device_uevent_modalias" [drivers/tty/serdev/serdev.ko] undefined!
> ERROR: "of_device_get_modalias" [drivers/tty/serdev/serdev.ko] undefined!
>
> Caused by commit
>
> cd6484e1830b ("serdev: Introduce new bus for serial attached devices")
>
> I have used the tty tree from next-20170203 for today.
Ugh, how has this been passing the 0-day bot builds succesfully?
Rob, any ideas?
thanks,
greg k-h
^ permalink raw reply
* Re: linux-next: build warning after merge of the tty tree
From: Greg KH @ 2017-02-06 8:50 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Ulrich Hecht, Geert Uytterhoeven
In-Reply-To: <20170206151638.6e0f8a60@canb.auug.org.au>
On Mon, Feb 06, 2017 at 03:16:38PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> After merging the tty tree, today's linux-next build
> (arm_multi_v7_defconfig) produced this warning:
>
> drivers/tty/serial/sh-sci.c:977:12: warning: 'scif_set_rtrg' defined but not used [-Wunused-function]
> static int scif_set_rtrg(struct uart_port *port, int rx_trig)
> ^
>
> Introduced by commit
>
> a380ed461f66 ("serial: sh-sci: implement FIFO threshold register setting")
>
> Forgot to add a call to this new function?
I think this is fixed by a patch I just took into my tree, which isn't
in linux-next yet. Right Ulrich? Or is this still a warning with your
latest patch series?
thanks,
greg k-h
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the v4l-dvb tree
From: Greg KH @ 2017-02-06 8:37 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mauro Carvalho Chehab, linux-next, linux-kernel, Sean Young,
Sudip Mukherjee
In-Reply-To: <20170206153151.3e999469@canb.auug.org.au>
On Mon, Feb 06, 2017 at 03:31:51PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/media/lirc/lirc_parallel.c
>
> between commit:
>
> 2933974cbb03 ("[media] staging: lirc_parallel: remove")
>
> from the v4l-dvb tree and commit:
>
> 1c5fa1c7dbff ("staging: media: lirc: use new parport device model")
>
> from the staging tree.
>
> Unfortunate ...
That's fine, thanks for letting me know, I didn't realize the file was
removed until after I had applied the patch :(
thanks,
greg k-h
^ permalink raw reply
* linux-next: Tree for Feb 6
From: Stephen Rothwell @ 2017-02-06 7:27 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20170203:
New trees: v4l-dvb-fixes, v4l-dvb-next
Undropped tree: vfs-miklos
The arm64 tree gained conflicts against the qcom tree.
The vfs-miklos tree lost its build failure.
The v4l-dvb tree lost its build failure.
The drm tree gained a conflict against the net-next tree.
The regulator tree lost its build failure.
The tty tree gained a build failure so I used the version from
next-20170203.
The staging tree gained a conflict against the v4l-dvb tree.
The scsi tree gained a build failure due to an interaction with the
block tree. I applied a merge fix patch.
Non-merge commits (relative to Linus' tree): 7549
8606 files changed, 316654 insertions(+), 159620 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 256 trees (counting Linus' and 37 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (a572a1b99948 Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
Merging arc-current/for-curr (566cf877a1fc Linux 4.10-rc6)
Merging arm-current/fixes (228dbbfb5d77 ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write)
Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (a0615a16f7d0 powerpc/mm: Use the correct pointer when setting a 2MB pte)
Merging sparc/master (f9a42e0d58cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (7892032cfe67 ip6_gre: fix ip6gre_err() invalid reads)
Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl)
Merging netfilter/master (a47b70ea86bd ravb: unmap descriptors when freeing rings)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware)
Merging mac80211/master (115865fa0826 mac80211: don't try to sleep in rate_control_rate_init())
Merging sound-current/for-linus (6cf4569ce356 Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (77fbffc2aa09 Revert "PCI: pciehp: Add runtime PM support for PCIe hotplug ports")
Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4)
Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4)
Merging usb.current/usb-linus (a572a1b99948 Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
Merging usb-serial-fixes/usb-linus (d07830db1bdb USB: serial: pl2303: add ATEN device ID)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
Merging staging.current/staging-linus (a572a1b99948 Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging char-misc.current/char-misc-linus (433e19cf33d3 Drivers: hv: vmbus: finally fix hv_need_to_signal_on_read())
Merging input-current/for-linus (601bbbe05173 Input: uinput - fix crash when mixing old and new init style)
Merging crypto-current/master (7c2cf1c4615c crypto: chcr - Fix key length for RFC4106)
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
Merging vfio-fixes/for-linus (2da64d20a0b2 vfio/spapr: Fix missing mutex unlock when creating a window)
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging v4l-dvb-fixes/fixes (f9f96fc10c09 [media] cec: fix wrong last_la determination)
Merging drm-intel-fixes/for-linux-next-fixes (566cf877a1fc Linux 4.10-rc6)
Merging drm-misc-fixes/for-linux-next-fixes (92c715fca907 drm/atomic: Fix double free in drm_atomic_state_default_clear)
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (fcd9955afaf1 ARC: [plat-*] ARC_HAS_COH_CACHES no longer relevant)
Merging arm/for-next (1ba318e23204 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (f6fbb582473b ARM: SoC: Document merges)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
Merging amlogic/for-next (700501d48123 Merge v4.11/dt64)
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
Merging at91/at91-next (e514f82c67c1 Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (57aba12f97c2 Merge branch 'zte/pm-domains' into for-next)
Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
Merging mvebu/for-next (f8e8eda32b4a Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (bfdc40158227 Merge branch 'omap-for-v4.11/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (9c96e7f72029 firmware: qcom: scm: Fix interrupted SCM calls)
Merging renesas/next (59fd3e06b3d7 Merge branches 'arm64-dt-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next)
Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (9689628ec120 Merge branch 'for-v4.11/drivers-soc-exynos-pmu-the-joy-never-ends' into for-next)
Merging tegra/for-next (6ef2dbf97439 Merge branch for-4.11/i2c into for-next)
Merging arm64/for-next/core (c0bfc549e962 perf: xgene: Include module.h)
CONFLICT (content): Merge conflict in include/linux/arm-smccc.h
CONFLICT (content): Merge conflict in arch/arm64/kernel/smccc-call.S
CONFLICT (content): Merge conflict in arch/arm64/kernel/arm64ksyms.c
CONFLICT (content): Merge conflict in arch/arm/kernel/armksyms.c
Merging clk/clk-next (5775a4c76fbc Merge tag 'v4.11-rockchip-clk2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (bc53b7e567ab m68k/defconfig: amcore board defconfig tuning)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (26eb4aa9a48a Merge branch '4.10-fixes' into mips-for-linux-next)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (c6a6bb78b493 openrisc: head: Init r0 to 0 on start)
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
Merging powerpc/next (673bc4354d42 powerpc/pseries: Report DLPAR capabilities)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (f83435c42ee6 s390/qdio: improve some debug prints)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6e72293ab0e9 xtensa: fix noMMU build on cores with MMU)
Merging fscrypt/master (a5d431eff2e0 fscrypt: make fscrypt_operations.key_prefix a string)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (be449cc159bc Merge branch 'for-next-current-v4.10-20170203' into for-next-20170203)
Merging ceph/master (6df8c9d80a27 ceph: fix bad endianness handling in parse_reply_info_extra)
Merging cifs/for-next (ae6f8dd4d0c8 CIFS: Allow to switch on encryption with seal mount option)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (a074faad5126 udf: simplify udf_ioctl())
Merging ext4/dev (224efa5c34a9 ext4: fix data corruption in data=journal mode)
Merging f2fs/dev (9b0d4b59b911 f2fs: declare missing static function)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (210675270caa fuse: fix time_to_jiffies nsec sanity check)
Merging gfs2/for-next (c548a1c17560 gfs2: Make gfs2_write_full_page static)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (566cf877a1fc Linux 4.10-rc6)
Merging nfsd/nfsd-next (42e24662a806 nfsd: special case truncates some more)
Merging orangefs/for-next (9a2f47943781 orangefs: Dan Carpenter influenced cleanups...)
Merging overlayfs/overlayfs-next (97e147358bea vfs: wrap write f_ops with file_{start,end}_write())
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
Merging xfs/for-next (e0d76fa4475e xfs: prevent quotacheck from overloading inode lru)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (69973b830859 Linux 4.9)
Merging printk/for-next (0e91b7706038 printk: drop call_console_drivers() unused param)
Merging pci/next (83a96ebd0efa Merge branch 'pci/host-thunder' into next)
Merging pstore/for-next/pstore (0c744ea4f77d Linux 4.10-rc2)
Merging hid/for-next (88128caee0fc Merge branch 'for-4.10/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (f4d9f6fbbf57 Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (646933284e46 DT: add binding documentation for STTS751)
Merging jc_docs/docs-next (c8929258a59b Documentation/sphinx: make targets independent of Sphinx work for HAVE_SPHINX=0)
Merging v4l-dvb/master (47b037a0512d [media] v4l2-async: failing functions shouldn't have side effects)
Merging v4l-dvb-next/master (2437eec568ae Merge branch 'patchwork' into to_next)
Merging fbdev/fbdev-for-next (561eb9d09a93 fbdev: omap/lcd: Make callbacks optional)
Merging pm/linux-next (fd4c9e3a71b4 Merge branch 'pm-core-fixes' into linux-next)
CONFLICT (content): Merge conflict in arch/mips/configs/lemote2f_defconfig
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (7b09ae6042cd Merge branches 'ida-conversion' and 'for-rc' into next)
Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (f1225ee4c8fc swiotlb-xen: update dev_addr after swapping pages)
Merging net-next/master (bd092ad1463c Merge branch 'remove-__napi_complete_done')
CONFLICT (content): Merge conflict in drivers/net/hyperv/netvsc.c
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging ipsec-next/master (62e13097c46c net: phy: broadcom: rehook BCM54612E specific init)
Merging netfilter-next/master (6e7bc478c9a0 net: skb_needs_check() accepts CHECKSUM_NONE for tx)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (36401cb7ffae brcmfmac: be more verbose when PSM's watchdog fires)
Merging bluetooth/master (264e6777f958 Merge branch 'netvsc-enhancements')
Merging mac80211-next/master (228c8c6b1f43 wireless: define cipher/AKM suites using a macro)
Merging rdma/for-next (24dc831b77ec IB/core: Add inline function to validate port)
Merging rdma-leon/rdma-next (69e8baab7757 Merge branch 'topic/core-for-4.11' into rdma-next)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging nand/nand/next (07f76443ef81 mtd: nand: mediatek: remove redundant dev_err call in mtk_nfc_probe())
Merging spi-nor/next (dc12bcccadaf mtd: spi-nor: cqspi: remove redundant dead code on error return check)
Merging crypto/master (1a20b9661265 crypto: arm/aes - don't use IV buffer to return final keystream block)
Merging drm/drm-next (99743ae4c5f5 Merge branch 'drm-etnaviv-next' of https://git.pengutronix.de/git/lst/linux into drm-next)
CONFLICT (content): Merge conflict in lib/Kconfig
CONFLICT (content): Merge conflict in include/drm/drm_connector.h
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sprite.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.c
Merging drm-panel/drm/panel/for-next (eaeebffa90f3 drm/panel: simple: Specify bus width and flags for EDT displays)
Merging drm-intel/for-linux-next (18566acac18f Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next)
Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices)
Merging drm-misc/for-linux-next (bb18dfcc640d drm: kselftest for drm_mm and bottom-up allocation)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (bb2893faed7b drm/msm: return -EFAULT if copy_from_user() fails)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (83d642ee6dbe drm: mali-dp: fix stride setting for multi-plane formats)
Merging sunxi/sunxi/for-next (e24f5ead1d61 Merge branch 'sunxi/dt64-for-4.11' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
Merging kspp/for-next/kspp (ffa3140e4264 initify: Mark functions with the __unverified_nocapture attribute)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (1cf05ba2cafa ALSA: pcm: Define dummy snd_pcm_suspend() for CONFIG_PM=n)
Merging sound-asoc/for-next (4a3f265abc6f Merge remote-tracking branches 'asoc/topic/wm0010', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (7598d167df99 livepatch/module: print notice of TAINT_LIVEPATCH)
Merging input/next (5ec69524d430 Input: joydev - use clamp() macro)
Merging block/for-next (03c2b7c0112c Merge branch 'for-4.11/next' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next)
Merging device-mapper/for-next (f5b0cba8f239 dm crypt: replace RCU read-side section with rwsem)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (0c3630150c9a mmc: core: start to break apart mmc_start_areq())
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (1b4c4139722b Documentation: move MD related doc into a separate dir)
Merging mfd/for-mfd-next (197ac6d28fce MAINTAINERS: Add include/dt-bindings/mfd to MFD entry)
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (744cc304a18f power: supply: add AC power supply driver for AXP20X and AXP22X PMICs)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (cc2310357795 Merge remote-tracking branches 'regulator/topic/s2mpa01', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next)
Merging security/next (70ea163699b6 tpm: silence an array overflow warning)
Merging integrity/next (20f482ab9e0f ima: allow to check MAY_APPEND)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3a2f5a59a695 security,selinux,smack: kill security_task_wait hook)
Applying: selinux: merge fix for "smc: establish new socket family"
Merging tpmdd/next (70ea163699b6 tpm: silence an array overflow warning)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
Merging iommu/next (66452a2d5f8f Merge branches 'iommu/fixes', 'arm/exynos', 'arm/smmu', 'arm/core', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages)
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
Merging audit/next (62bc306e2083 audit: log 32-bit socketcalls)
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (8cf4664332d3 dt-bindings: power: reset: qnap-poweroff: Drop reference to pm_power_off)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (3f87493930a0 Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (5bf728f02218 Merge branch 'x86/platform')
CONFLICT (content): Merge conflict in security/apparmor/include/apparmor.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
Applying: locking/atomic, kref: merge fixup for code movement
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Merging edac-amd/for-next (321d17c19bf5 EDAC, mpc85xx: Add T2080 l2-cache support)
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
Merging ftrace/for-next (e704eff3ff51 ftrace: Have set_graph_function handle multiple functions in one write)
Merging rcu/rcu/next (40b1f8f7b57f rcu: Default RCU_FANOUT_LEAF to 16 unless explicitly changed)
CONFLICT (content): Merge conflict in net/netfilter/nf_conntrack_core.c
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Applying: smc: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Merging kvm/linux-next (0b4c208d443b Revert "KVM: nested VMX: disable perf cpuid reporting")
Merging kvm-arm/next (49a81ab0e8c7 KVM: arm/arm64: Emulate the EL1 phys timer registers)
Merging kvm-mips/next (12ed1faece3f KVM: MIPS: Allow multiple VCPUs to be created)
Merging kvm-ppc/kvm-ppc-next (050f23390f6b KVM: PPC: Book3S HV: Advertise availablity of HPT resizing on KVM HV)
Merging kvms390/next (a8c39dd77cb9 KVM: s390: Add debug logging to basic cpu model interface)
Merging xen-tip/linux-next (4fed1b125eb6 xen/manage: correct return value check on xenbus_scanf())
Merging percpu/for-next (966d2b04e070 percpu-refcount: fix reference leak during percpu-atomic transition)
Merging workqueues/for-next (a45463cbf3f9 workqueue: avoid clang warning)
Merging drivers-x86/for-next (e3c1763c26c0 platform/x86: intel_mid_powerbtn: Unify IRQ acknowledegment)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (8bb1de680dac tools/leds: Add led_hw_brightness_mon program)
Merging ipmi/for-next (c5afee1b0dfc acpi:ipmi: Make IPMI user handler const)
Merging driver-core/driver-core-next (64e90a8acb85 Introduce STATIC_USERMODEHELPER to mediate call_usermodehelper())
Merging tty/tty-next (8ee3fde04758 tty_port: register tty ports with serdev bus)
$ git reset --hard HEAD^
Merging next-20170203 version of tty
Merging usb/usb-next (530b7a3e216e Merge tag 'usb-ci-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next)
Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions)
Merging usb-serial/usb-next (c528fcb116e6 USB: serial: keyspan_pda: fix receive sanity checks)
Merging usb-chipidea-next/ci-for-usb-next (753dfd23612d usb: chipidea: msm: Fix return value check in ci_hdrc_msm_probe())
Merging phy-next/next (0b10f64dbe60 phy: qcom-ufs: Fix misplaced jump label)
Merging staging/staging-next (cb23ebdfa6a4 Drivers: staging: speakup: spk_priv.h - style fix)
CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_parallel.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_parallel.c left in tree.
CONFLICT (modify/delete): drivers/staging/greybus/timesync_platform.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/greybus/timesync_platform.c left in tree.
$ git rm -f drivers/staging/greybus/timesync_platform.c
$ git rm -f drivers/staging/media/lirc/lirc_parallel.c
Merging char-misc/char-misc-next (3b28f4f2c2c7 checkkconfigsymbols.py: support Kconfig's 'imply' statement)
CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst
Merging extcon/extcon-next (8ea227886002 extcon: arizona: Wait for any running HPDETs to complete on jack removal)
Merging slave-dma/next (bd98fba52645 Merge branch 'for-linus' into next)
Merging cgroup/for-next (63f1ca59453a Merge branch 'cgroup/for-4.11-rdmacg' into cgroup/for-4.11)
Merging scsi/for-next (66043a3bcbce Merge branch 'misc' into for-next)
Applying: scsi: mpt3sas: fix up for "block: fold cmd_type into the REQ_OP_ space"
Merging scsi-mkp/for-next (86e6828a8aed scsi: scsi_debug: Add OPTIMAL TRANSFER LENGTH GRANULARITY option.)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (d5443f08f8d2 target: Avoid that XCOPY commands trigger a deadlock)
Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (80363894995b virtio_mmio: expose header to userspace)
Merging rpmsg/for-next (5029eb953682 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (e4df1ebdfeb4 Merge branch 'ib-gpiod-flags' into devel)
CONFLICT (content): Merge conflict in drivers/staging/greybus/gpio.c
Merging pinctrl/for-next (2039834c86f3 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (4651209c75d1 Merge branch 'for-4.11/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (1064f874abc0 mnt: Tuck mounts under others instead of creating shadow/side mounts.)
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (c440408cf690 random: convert get_random_int/long into get_random_u32/u64)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1e4c2830c369 selftest: cpufreq: Add special tests)
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
Merging coresight/next (7f12a0d4a674 coresight: STM: Balance enable/disable)
Merging rtc/rtc-next (4c6106406eb1 rtc: sun6i: Fix compatibility with old DT binding)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (bfb34527a32a libnvdimm, pfn: fix memmap reservation size versus 4K alignment)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging extable/extable (24bf9bdef929 module.h: remove extable.h include now users have migrated)
Merging idr/idr-4.11 (39272ecab724 radix-tree: Store a pointer to the root in each node)
Merging akpm-current/current (1c780c0a83aa ipc/mqueue: add missing sparse annotation)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs: add i_blocksize()
Applying: truncate: use i_blocksize()
Applying: nilfs2: use nilfs_btree_node_size()
Applying: nilfs2: use i_blocksize()
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: scripts/spelling.txt: add some typo-words
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
Merging akpm/master (46c3b4fb2482 mm: clarify mm_struct.mm_{users,count} documentation)
^ 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