* Re: [PATCH] staging: rtl8188eu: style fixes
From: Nicholas Mc Guire @ 2017-06-02 17:41 UTC (permalink / raw)
To: Galo; +Cc: linux-next, Greg Kroah-Hartman, Larry Finger
In-Reply-To: <20170602143643.GA9038@lear>
On Fri, Jun 02, 2017 at 04:36:44PM +0200, Galo wrote:
> Fix several "CHECK: spaces preferred around that .." checks.
>
> Signed-off-by: Galo Navarro <anglor@varoa.net>
cleanup patches are ok - but if you do cleanups you should also
run checkpatch.pl on your patch. This would have shown you that
two of the lines you fixed are over 80 char and should be broken
Also I do not see much sense in picking out individual lines for
space fixing and leaving other adjacent lines out e.g.:
ss_final = ((u32)(src->PhyInfo.SignalStrength)+(u32)(dst->PhyInfo.SignalStrength)*4)/5;
sq_final = ((u32)(src->PhyInfo.SignalQuality)+(u32)(dst->PhyInfo.SignalQuality)*4)/5;
rssi_final = (src->Rssi+dst->Rssi*4)/5;
All three lines have the same spacing issue - but your patch addresses
the last line only. While it is ok not to fix all spacing issues in a
file at once I think that at least within a basic block one should keep
it consistent. style cleanup intends to make code more readable but if
styles are mixed on a line-by-line basis this goal is hardly achieved
I would prefere you redo this patch and ensure at least local consistency
>
> ---
> drivers/staging/rtl8188eu/core/rtw_mlme.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> index de9ab59..92f7297 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> @@ -370,14 +370,14 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
> sq_final = padapter->recvpriv.signal_qual;
> /* the rssi value here is undecorated, and will be used for antenna diversity */
> if (sq_smp != 101) /* from the right channel */
> - rssi_final = (src->Rssi+dst->Rssi*4)/5;
> + rssi_final = (src->Rssi + dst->Rssi * 4) / 5;
> else
> rssi_final = rssi_ori;
> } else {
> if (sq_smp != 101) { /* from the right channel */
> ss_final = ((u32)(src->PhyInfo.SignalStrength)+(u32)(dst->PhyInfo.SignalStrength)*4)/5;
> sq_final = ((u32)(src->PhyInfo.SignalQuality)+(u32)(dst->PhyInfo.SignalQuality)*4)/5;
> - rssi_final = (src->Rssi+dst->Rssi*4)/5;
> + rssi_final = (src->Rssi + dst->Rssi * 4) / 5;
> } else {
> /* bss info not receiving from the right channel, use the original RX signal infos */
> ss_final = dst->PhyInfo.SignalStrength;
> @@ -1926,7 +1926,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
>
> if (pqospriv->qos_option == 0) {
> out_len = *pout_len;
> - rtw_set_ie(out_ie+out_len, _VENDOR_SPECIFIC_IE_,
> + rtw_set_ie(out_ie + out_len, _VENDOR_SPECIFIC_IE_,
> _WMM_IE_Length_, WMM_IE, pout_len);
>
> pqospriv->qos_option = 1;
> @@ -1964,10 +1964,10 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
>
> phtpriv->ht_option = true;
>
> - p = rtw_get_ie(in_ie+12, _HT_ADD_INFO_IE_, &ielen, in_len-12);
> + p = rtw_get_ie(in_ie + 12, _HT_ADD_INFO_IE_, &ielen, in_len - 12);
p = rtw_get_ie(in_ie + 12, _HT_ADD_INFO_IE_, &ielen,
in_len - 12);
> if (p && (ielen == sizeof(struct ieee80211_ht_addt_info))) {
> out_len = *pout_len;
> - rtw_set_ie(out_ie+out_len, _HT_ADD_INFO_IE_, ielen, p+2, pout_len);
> + rtw_set_ie(out_ie + out_len, _HT_ADD_INFO_IE_, ielen, p + 2, pout_len);
rtw_set_ie(out_ie + out_len, _HT_ADD_INFO_IE_, ielen,
p + 2, pout_len);
> }
> }
> return phtpriv->ht_option;
> @@ -2058,8 +2058,8 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
> phtpriv = &psta->htpriv;
>
> if ((phtpriv->ht_option) && (phtpriv->ampdu_enable)) {
> - issued = (phtpriv->agg_enable_bitmap>>priority)&0x1;
> - issued |= (phtpriv->candidate_tid_bitmap>>priority)&0x1;
> + issued = (phtpriv->agg_enable_bitmap >> priority) & 0x1;
> + issued |= (phtpriv->candidate_tid_bitmap >> priority) & 0x1;
>
> if (issued == 0) {
> DBG_88E("rtw_issue_addbareq_cmd, p=%d\n", priority);
> --
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
thx!
hofrat
^ permalink raw reply
* Re: linux-next: build failure after merge of the rcu tree
From: Paul E. McKenney @ 2017-06-02 17:51 UTC (permalink / raw)
To: Michael Ellerman
Cc: Stephen Rothwell, Linux-Next Mailing List,
Linux Kernel Mailing List, Joe Perches, Mike Frysinger,
Steven Miao
In-Reply-To: <874lw36l3h.fsf@concordia.ellerman.id.au>
On Tue, May 30, 2017 at 02:10:26PM +1000, Michael Ellerman wrote:
> "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> writes:
>
> > On Mon, May 29, 2017 at 04:02:09PM +1000, Stephen Rothwell wrote:
> >> Hi Paul,
> >>
> >> After merging the rcu tree, today's linux-next build (bfin
> >> BF526-EZBRD_defconfig and several other bfin configs) failed like this:
> >>
> >> In file included from include/linux/srcu.h:60:0,
> >> from include/linux/notifier.h:15,
> >> from include/linux/memory_hotplug.h:6,
> >> from include/linux/mmzone.h:777,
> >> from include/linux/gfp.h:5,
> >> from include/linux/kmod.h:22,
> >> from include/linux/module.h:13,
> >> from include/linux/moduleloader.h:5,
> >> from arch/blackfin/kernel/module.c:9:
> >> include/linux/srcutiny.h: In function 'srcu_torture_stats_print':
> >> include/linux/srcutiny.h:96:2: error: 'mod' undeclared (first use in this function)
> >>
> >> Caused by commit
> >>
> >> 54ffb22bd841 ("rcutorture: Move SRCU status printing to SRCU implementations")
> >
> > And of course this is nothing but a printk().
>
> Ah but it's not, it's a pr_alert():
>
> + pr_alert("%s%s Tiny SRCU per-CPU(idx=%d): (%hd,%hd)\n",
> + tt, tf, idx,
> + READ_ONCE(sp->srcu_lock_nesting[!idx]),
> + READ_ONCE(sp->srcu_lock_nesting[idx]));
>
> Where pr_alert() is:
>
> #define pr_alert(fmt, ...) \
> printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)
>
>
> So that's where pr_fmt() is coming into it.
>
> And if any code in module.c called srcu_torture_stats_print(), it would
> actually claim to come from "module: ", which would be confusing.
>
> I don't think you use pr_fmt() in the RCU code, so you could skip using
> pr_alert() and just use printk(KERN_ALERT "...") and get the same
> result, without any interactions with pr_fmt().
Does the following patch fix things for you?
Thanx, Paul
------------------------------------------------------------------------
commit 7eb8d998d3f66851c0d25abcdb2d737edc6a21ed
Author: Joe Perches <joe@perches.com>
Date: Tue May 30 15:20:37 2017 -0700
module: Fix pr_fmt() bug for header use of printk
This commit removes the pr_fmt() macro, replacing it with mod_err() and
mod_debug() macros to avoid errors when using printk() from header files.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
diff --git a/arch/blackfin/kernel/module.c b/arch/blackfin/kernel/module.c
index 0188c933b155..15af5768c403 100644
--- a/arch/blackfin/kernel/module.c
+++ b/arch/blackfin/kernel/module.c
@@ -4,8 +4,6 @@
* Licensed under the GPL-2 or later
*/
-#define pr_fmt(fmt) "module %s: " fmt, mod->name
-
#include <linux/moduleloader.h>
#include <linux/elf.h>
#include <linux/vmalloc.h>
@@ -16,6 +14,11 @@
#include <asm/cacheflush.h>
#include <linux/uaccess.h>
+#define mod_err(mod, fmt, ...) \
+ pr_err("module %s: " fmt, (mod)->name, ##__VA_ARGS__)
+#define mod_debug(mod, fmt, ...) \
+ pr_debug("module %s: " fmt, (mod)->name, ##__VA_ARGS__)
+
/* Transfer the section to the L1 memory */
int
module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
@@ -44,7 +47,7 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l1_inst_sram_alloc(s->sh_size);
mod->arch.text_l1 = dest;
if (dest == NULL) {
- pr_err("L1 inst memory allocation failed\n");
+ mod_err(mod, "L1 inst memory allocation failed\n");
return -1;
}
dma_memcpy(dest, (void *)s->sh_addr, s->sh_size);
@@ -56,7 +59,7 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l1_data_sram_alloc(s->sh_size);
mod->arch.data_a_l1 = dest;
if (dest == NULL) {
- pr_err("L1 data memory allocation failed\n");
+ mod_err(mod, "L1 data memory allocation failed\n");
return -1;
}
memcpy(dest, (void *)s->sh_addr, s->sh_size);
@@ -68,7 +71,7 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l1_data_sram_zalloc(s->sh_size);
mod->arch.bss_a_l1 = dest;
if (dest == NULL) {
- pr_err("L1 data memory allocation failed\n");
+ mod_err(mod, "L1 data memory allocation failed\n");
return -1;
}
@@ -77,7 +80,7 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l1_data_B_sram_alloc(s->sh_size);
mod->arch.data_b_l1 = dest;
if (dest == NULL) {
- pr_err("L1 data memory allocation failed\n");
+ mod_err(mod, "L1 data memory allocation failed\n");
return -1;
}
memcpy(dest, (void *)s->sh_addr, s->sh_size);
@@ -87,7 +90,7 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l1_data_B_sram_alloc(s->sh_size);
mod->arch.bss_b_l1 = dest;
if (dest == NULL) {
- pr_err("L1 data memory allocation failed\n");
+ mod_err(mod, "L1 data memory allocation failed\n");
return -1;
}
memset(dest, 0, s->sh_size);
@@ -99,7 +102,7 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l2_sram_alloc(s->sh_size);
mod->arch.text_l2 = dest;
if (dest == NULL) {
- pr_err("L2 SRAM allocation failed\n");
+ mod_err(mod, "L2 SRAM allocation failed\n");
return -1;
}
memcpy(dest, (void *)s->sh_addr, s->sh_size);
@@ -111,7 +114,7 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l2_sram_alloc(s->sh_size);
mod->arch.data_l2 = dest;
if (dest == NULL) {
- pr_err("L2 SRAM allocation failed\n");
+ mod_err(mod, "L2 SRAM allocation failed\n");
return -1;
}
memcpy(dest, (void *)s->sh_addr, s->sh_size);
@@ -123,7 +126,7 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l2_sram_zalloc(s->sh_size);
mod->arch.bss_l2 = dest;
if (dest == NULL) {
- pr_err("L2 SRAM allocation failed\n");
+ mod_err(mod, "L2 SRAM allocation failed\n");
return -1;
}
@@ -157,8 +160,8 @@ apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
Elf32_Sym *sym;
unsigned long location, value, size;
- pr_debug("applying relocate section %u to %u\n",
- relsec, sechdrs[relsec].sh_info);
+ mod_debug(mod, "applying relocate section %u to %u\n",
+ relsec, sechdrs[relsec].sh_info);
for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
/* This is where to make the change */
@@ -174,14 +177,14 @@ apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
#ifdef CONFIG_SMP
if (location >= COREB_L1_DATA_A_START) {
- pr_err("cannot relocate in L1: %u (SMP kernel)\n",
+ mod_err(mod, "cannot relocate in L1: %u (SMP kernel)\n",
ELF32_R_TYPE(rel[i].r_info));
return -ENOEXEC;
}
#endif
- pr_debug("location is %lx, value is %lx type is %d\n",
- location, value, ELF32_R_TYPE(rel[i].r_info));
+ mod_debug(mod, "location is %lx, value is %lx type is %d\n",
+ location, value, ELF32_R_TYPE(rel[i].r_info));
switch (ELF32_R_TYPE(rel[i].r_info)) {
@@ -200,12 +203,12 @@ apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
case R_BFIN_PCREL12_JUMP:
case R_BFIN_PCREL12_JUMP_S:
case R_BFIN_PCREL10:
- pr_err("unsupported relocation: %u (no -mlong-calls?)\n",
+ mod_err(mod, "unsupported relocation: %u (no -mlong-calls?)\n",
ELF32_R_TYPE(rel[i].r_info));
return -ENOEXEC;
default:
- pr_err("unknown relocation: %u\n",
+ mod_err(mod, "unknown relocation: %u\n",
ELF32_R_TYPE(rel[i].r_info));
return -ENOEXEC;
}
@@ -222,7 +225,7 @@ apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
isram_memcpy((void *)location, &value, size);
break;
default:
- pr_err("invalid relocation for %#lx\n", location);
+ mod_err(mod, "invalid relocation for %#lx\n", location);
return -ENOEXEC;
}
}
^ permalink raw reply related
* Re: linux-next: build warnings after merge of the drm tree
From: Eric Anholt @ 2017-06-02 21:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Linux-Next Mailing List, Linux Kernel Mailing List,
Tom Cooksey, Daniel Vetter, Linus Walleij, Arnd Bergmann
In-Reply-To: <20170602135925.70272f31@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 3090 bytes --]
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> On Thu, 25 May 2017 11:49:42 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> On Fri, 19 May 2017 10:49:06 -0700 Eric Anholt <eric@anholt.net> wrote:
>> >
>> > Stephen Rothwell <sfr@canb.auug.org.au> writes:
>> >
>> > > After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
>> > > produced these warnings:
>> > >
>> > > drivers/gpu/drm/pl111/pl111_drv.c:81:12: warning: 'pl111_modeset_init' defined but not used [-Wunused-function]
>> > > static int pl111_modeset_init(struct drm_device *dev)
>> > > ^
>> > > drivers/gpu/drm/pl111/pl111_drv.c:149:26: warning: 'pl111_drm_driver' defined but not used [-Wunused-variable]
>> > > static struct drm_driver pl111_drm_driver = {
>> > > ^
>> >
>> > Sorry about that -- I thought that kbuild test robot would give me
>> > notification of new warnings.
>> >
>> > Patch incoming.
>>
>> I saw the patch, but it doesn't seem to have been applied anywhere yet.
>
> So these warnings went away yesterday, but are back today after quite a
> few patches were dropped from the drm-misc tree.
>
> Yesterday it contained theses (relative to the drm tree):
>
> 9a8d5e4a53dc drm/vc4: Fix comment in vc4_drv.h
> 66d6dd45eee2 drm/pl111: fix warnings without CONFIG_ARM_AMBA
> 91110a4b64fe drm/atomic: Consitfy mode parameter to drm_atomic_set_mode_for_crtc()
> fb51cbfd4b2e drm/arcgpu: Drop drm_vblank_cleanup
> e3ec0e1e38a5 drm/atmel: Drop drm_vblank_cleanup
> 85769cf7cd7f drm/imx: Drop drm_vblank_cleanup
> a360b39b5137 drm/meson: Drop drm_vblank_cleanup
> 25b905fe4323 drm/stm: Drop drm_vblank_cleanup
> d79373bd4d7e drm/sun4i: Drop drm_vblank_cleanup
> 8938d13585bc drm: better document how to send out the crtc disable event
> 46466b0dac3f drm: Use vsnprintf extension %ph
> 99cdb35e787b drm/doc: move printf helpers out of drmP.h
> e7cc23de3e4e drm/pl111: select DRM_PANEL
> 7dbcbce9f551 drm/bridge: analogix-anx78xx: Use bridge->mode_valid() callback
> faf94a0883ce drm: Use mode_valid() in atomic modeset
> 97f973d65260 drm: Use new mode_valid() helpers in connector probe helper
> b1240f81a186 drm: Introduce drm_bridge_mode_valid()
> da251bf8f935 drm: Add drm_{crtc/encoder/connector}_mode_valid()
> 18e51064c42c drm: Remove drm_device->virtdev
> a301b1118615 drm: todo: remove task about switch to drm_connector_list_iter
> eb53a46be597 drm: remove unsafe drm_for_each_connector()
> 4894bf711d19 drm/vc4: use drm_for_each_connector_iter()
> 875dd62697fe drm/nouveau: use drm_for_each_connector_iter()
> c8bf8b968adb drm/mediatek: use drm_for_each_connector_iter()
> 2fd96b4116bf drm/i915: use drm_for_each_connector_iter()
> 2cbeb64f6c70 drm/rockchip: use drm_for_each_connector_iter()
> 48a92916729b drm/exynos: use drm_for_each_connector_iter()
>
> Today it only has:
>
> 2d7b56378d32 drm/rockchip: gem: add the lacks lock and trivial changes
Not sure what's going on. I see your "yesterday" list present, and not
your "today" commit.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply
* mmotm 2017-06-02-14-13 uploaded
From: akpm @ 2017-06-02 21:14 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2017-06-02-14-13 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.12-rc3:
(patches marked "*" will be included in linux-next)
origin.patch
i-need-old-gcc.patch
* ksm-prevent-crash-after-write_protect_page-fails.patch
* include-linux-gfph-fix-___gfp_nolockdep-value.patch
* frv-declare-jiffies-to-be-located-in-the-data-section.patch
* mm-clarify-why-we-want-kmalloc-before-falling-backto-vmallock.patch
* mm-clarify-why-we-want-kmalloc-before-falling-backto-vmallock-checkpatch-fixes.patch
* initramfs-fix-disabling-of-initramfs-and-its-compression.patch
* slub-memcg-cure-the-brainless-abuse-of-sysfs-attributes.patch
* pcmcia-remove-left-over-%z-format.patch
* mmpage_alloc-make-sure-oom-victim-can-try-allocations-with-no-watermarks-once.patch
* mm-avoid-spurious-bad-pmd-warning-messages.patch
* dax-fix-race-between-colliding-pmd-pte-entries.patch
* dax-fix-race-between-colliding-pmd-pte-entries-fix.patch
* mm-migrate-fix-ref-count-handling-when-hugepage_migration_supported-v2.patch
* mm-migrate-fix-ref-count-handling-when-hugepage_migration_supported-v2-fix.patch
* mlock-fix-mlock-count-can-not-decrease-in-race-condition.patch
* mm-hugetlb-report-ehwpoison-not-efault-when-foll_hwpoison-is-specified.patch
* mm-hugetlb-report-ehwpoison-not-efault-when-foll_hwpoison-is-specified-checkpatch-fixes.patch
* mm-hugetlb-report-ehwpoison-not-efault-when-foll_hwpoison-is-specified-v2.patch
* mm-consider-memblock-reservations-for-deferred-memory-initialization-sizing.patch
* scripts-gdb-make-lx-dmesg-command-work-reliably.patch
* mm-skip-hwpoisoned-pages-when-onlining-pages.patch
* mm-hwpoison-use-compound_head-flags-for-huge-pages.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* mn10300-remove-wrapper-header-for-asm-deviceh.patch
* mn10300-use-generic-fbh.patch
* tile-provide-default-ioremap-declaration.patch
* teach-initramfs_root_uid-and-initramfs_root_gid-that-1-means-current-user.patch
* clarify-help-text-that-compression-applies-to-ramfs-as-well-as-legacy-ramdisk.patch
* sh-intc-delete-an-error-message-for-a-failed-memory-allocation-in-add_virq_to_pirq.patch
* ocfs2-fix-a-static-checker-warning.patch
* ocfs2-use-magich.patch
* ocfs2-get-rid-of-ocfs2_is_o2cb_active-function.patch
* ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called.patch
* ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
* ocfs2-dlm-optimization-of-code-while-free-dead-node-locks.patch
* ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
* ocfs2-give-an-obvious-tip-for-dismatch-cluster-names.patch
* ocfs2-give-an-obvious-tip-for-dismatch-cluster-names-v2.patch
* ocfs2-move-some-definitions-to-header-file.patch
* ocfs2-fix-some-small-problems.patch
* ocfs2-add-kobject-for-online-file-check.patch
* ocfs2-add-duplicative-ino-number-check.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* fs-file-replace-alloc_fdmem-with-kvmalloc-alternative.patch
mm.patch
* mm-slub-remove-a-redundant-assignment-in-___slab_alloc.patch
* mm-slub-reset-cpu_slabs-pointer-in-deactivate_slab.patch
* mm-slub-pack-red_left_pad-with-another-int-to-save-a-word.patch
* mm-slub-wrap-cpu_slab-partial-in-config_slub_cpu_partial.patch
* mm-slub-wrap-cpu_slab-partial-in-config_slub_cpu_partial-fix.patch
* mm-slub-wrap-kmem_cache-cpu_partial-in-config-config_slub_cpu_partial.patch
* mm-sparsemem-break-out-of-loops-early.patch
* mark-protection_map-as-__ro_after_init.patch
* mm-vmscan-fix-unsequenced-modification-and-access-warning.patch
* mm-nobootmem-return-0-when-start_pfn-equals-end_pfn.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit.patch
* ksm-fix-use-after-free-with-merge_across_nodes-=-0.patch
* ksm-cleanup-stable_node-chain-collapse-case.patch
* ksm-swap-the-two-output-parameters-of-chain-chain_prune.patch
* ksm-optimize-refile-of-stable_node_dup-at-the-head-of-the-chain.patch
* zram-introduce-zram_entry-to-prepare-dedup-functionality.patch
* zram-implement-deduplication-in-zram.patch
* zram-make-deduplication-feature-optional.patch
* zram-compare-all-the-entries-with-same-checksum-for-deduplication.patch
* zram-count-same-page-write-as-page_stored.patch
* zram-do-not-count-duplicated-pages-as-compressed.patch
* zram-clean-up-duplicated-codes-in-__zram_bvec_write.patch
* mm-vmstat-standardize-file-operations-variable-names.patch
* mm-thp-swap-delay-splitting-thp-during-swap-out.patch
* mm-thp-swap-delay-splitting-thp-during-swap-out-fix.patch
* mm-thp-swap-unify-swap-slot-free-functions-to-put_swap_page.patch
* mm-thp-swap-move-anonymous-thp-split-logic-to-vmscan.patch
* mm-thp-swap-check-whether-thp-can-be-split-firstly.patch
* mm-thp-swap-enable-thp-swap-optimization-only-if-has-compound-map.patch
* mm-remove-return-value-from-init_currently_empty_zone.patch
* mm-memory_hotplug-use-node-instead-of-zone-in-can_online_high_movable.patch
* mm-drop-page_initialized-check-from-get_nid_for_pfn.patch
* mm-memory_hotplug-get-rid-of-is_zone_device_section.patch
* mm-memory_hotplug-split-up-register_one_node.patch
* mm-memory_hotplug-consider-offline-memblocks-removable.patch
* mm-consider-zone-which-is-not-fully-populated-to-have-holes.patch
* mm-consider-zone-which-is-not-fully-populated-to-have-holes-fix.patch
* mm-compaction-skip-over-holes-in-__reset_isolation_suitable.patch
* mm-__first_valid_page-skip-over-offline-pages.patch
* mm-vmstat-skip-reporting-offline-pages-in-pagetypeinfo.patch
* mm-vmstat-skip-reporting-offline-pages-in-pagetypeinfo-fix.patch
* mm-memory_hotplug-do-not-associate-hotadded-memory-to-zones-until-online.patch
* mm-memory_hotplug-fix-mmop_online_keep-behavior.patch
* mm-memory_hotplug-do-not-assume-zone_normal-is-default-kernel-zone.patch
* mm-memory_hotplug-replace-for_device-by-want_memblock-in-arch_add_memory.patch
* mm-memory_hotplug-fix-the-section-mismatch-warning.patch
* mm-memory_hotplug-remove-unused-cruft-after-memory-hotplug-rework.patch
* exit-dont-include-unused-userfaultfd_kh.patch
* userfaultfd-drop-dead-code.patch
* mm-madvise-enable-softhard-offline-of-hugetlb-pages-at-pgd-level.patch
* mm-madvise-enable-softhard-offline-of-hugetlb-pages-at-pgd-level-fix.patch
* mm-hugetlb-migration-use-set_huge_pte_at-instead-of-set_pte_at.patch
* mm-follow_page_mask-split-follow_page_mask-to-smaller-functions.patch
* mm-hugetlb-export-hugetlb_entry_migration-helper.patch
* mm-follow_page_mask-add-support-for-hugetlb-pgd-entries.patch
* mm-hugetlb-move-default-definition-of-hugepd_t-earlier-in-the-header.patch
* mm-follow_page_mask-add-support-for-hugepage-directory-entry.patch
* powerpc-hugetlb-add-follow_huge_pd-implementation-for-ppc64.patch
* powerpc-mm-hugetlb-remove-follow_huge_addr-for-powerpc.patch
* powerpc-hugetlb-enable-hugetlb-migration-for-ppc64.patch
* mm-zeroing-hash-tables-in-allocator.patch
* mm-updated-callers-to-use-hash_zero-flag.patch
* mm-adaptive-hash-table-scaling.patch
* mm-adaptive-hash-table-scaling-fix.patch
* mm-adaptive-hash-table-scaling-v2.patch
* mm-adaptive-hash-table-scaling-v5.patch
* mm-hugetlb-cleanup-arch_has_gigantic_page.patch
* powerpc-mm-hugetlb-add-support-for-1g-huge-pages.patch
* mm-page_alloc-mark-bad_range-and-meminit_pfn_in_nid-as-__maybe_unused.patch
* mm-drop-null-return-check-of-pte_offset_map_lock.patch
* arm64-hugetlb-refactor-find_num_contig.patch
* arm64-hugetlb-remove-spurious-calls-to-huge_ptep_offset.patch
* mm-gup-remove-broken-vm_bug_on_page-compound-check-for-hugepages.patch
* mm-gup-ensure-real-head-page-is-ref-counted-when-using-hugepages.patch
* mm-hugetlb-add-size-parameter-to-huge_pte_offset.patch
* mm-hugetlb-allow-architectures-to-override-huge_pte_clear.patch
* mm-hugetlb-introduce-set_huge_swap_pte_at-helper.patch
* mm-hugetlb-introduce-set_huge_swap_pte_at-helper-v4.patch
* mm-hugetlb-introduce-set_huge_swap_pte_at-helper-v41.patch
* mm-rmap-use-correct-helper-when-poisoning-hugepages.patch
* mm-page_alloc-fix-more-premature-oom-due-to-race-with-cpuset-update.patch
* mm-mempolicy-stop-adjusting-current-il_next-in-mpol_rebind_nodemask.patch
* mm-page_alloc-pass-preferred-nid-instead-of-zonelist-to-allocator.patch
* mm-mempolicy-simplify-rebinding-mempolicies-when-updating-cpusets.patch
* mm-cpuset-always-use-seqlock-when-changing-tasks-nodemask.patch
* mm-mempolicy-dont-check-cpuset-seqlock-where-it-doesnt-matter.patch
* swap-add-block-io-poll-in-swapin-path.patch
* swap-add-block-io-poll-in-swapin-path-checkpatch-fixes.patch
* mm-kmemleak-slightly-reduce-the-size-of-some-structures-on-64-bit-architectures.patch
* mm-kmemleak-factor-object-reference-updating-out-of-scan_block.patch
* mm-kmemleak-treat-vm_struct-as-alternative-reference-to-vmalloced-objects.patch
* mm-drop-wait-parameter-from-write_one_page.patch
* mm-drop-wait-parameter-from-write_one_page-fix.patch
* mm-fix-mapping_set_error-call-in-me_pagecache_dirty.patch
* mm-per-cgroup-memory-reclaim-stats.patch
* mm-oom_kill-count-global-and-memory-cgroup-oom-kills.patch
* mm-oom_kill-count-global-and-memory-cgroup-oom-kills-fix.patch
* mm-oom_kill-count-global-and-memory-cgroup-oom-kills-fix-fix.patch
* mm-swap-sort-swap-entries-before-free.patch
* mm-swap-sort-swap-entries-before-free-fix.patch
* zswap-delete-an-error-message-for-a-failed-memory-allocation-in-zswap_pool_create.patch
* zswap-improve-a-size-determination-in-zswap_frontswap_init.patch
* zswap-delete-an-error-message-for-a-failed-memory-allocation-in-zswap_dstmem_prepare.patch
* mm-vmstat-move-slab-statistics-from-zone-to-node-counters.patch
* mm-memcontrol-use-the-node-native-slab-memory-counters.patch
* mm-memcontrol-use-generic-mod_memcg_page_state-for-kmem-pages.patch
* mm-memcontrol-per-lruvec-stats-infrastructure.patch
* mm-memcontrol-per-lruvec-stats-infrastructure-fix.patch
* mm-memcontrol-account-slab-stats-per-lruvec.patch
* mm-memory_hotplug-drop-artificial-restriction-on-online-offline.patch
* mm-memory_hotplug-drop-config_movable_node.patch
* mm-memory_hotplug-move-movable_node-to-the-hotplug-proper.patch
* mm-page_alloc-fallback-to-smallest-page-when-not-stealing-whole-pageblock.patch
* mm-convert-to-define_debugfs_attribute.patch
* mm-vmscan-avoid-thrashing-anon-lru-when-free-file-is-low.patch
* mm-vmscan-avoid-thrashing-anon-lru-when-free-file-is-low-fix.patch
* mm-add-null-check-to-avoid-potential-null-pointer-dereference.patch
* mm-zsmalloc-fix-wunneeded-internal-declaration-warning.patch
* fs-bufferc-make-bh_lru_install-more-efficient.patch
* mm-hugetlb-prevent-reuse-of-hwpoisoned-free-hugepages.patch
* mm-hugetlb-return-immediately-for-hugetlb-page-in-__delete_from_page_cache.patch
* mm-hwpoison-change-pagehwpoison-behavior-on-hugetlb-pages.patch
* mm-hugetlb-soft-offline-dissolve-source-hugepage-after-successful-migration.patch
* mm-soft-offline-dissolve-free-hugepage-if-soft-offlined.patch
* mm-hwpoison-introduce-memory_failure_hugetlb.patch
* mm-hwpoison-dissolve-in-use-hugepage-in-unrecoverable-memory-error.patch
* mm-hwpoison-dissolve-in-use-hugepage-in-unrecoverable-memory-error-fix.patch
* mm-hugetlb-delete-dequeue_hwpoisoned_huge_page.patch
* mm-hwpoison-introduce-idenfity_page_state.patch
* mm-vmpressure-pass-through-notification-support.patch
* binfmt_elf-document-load_bias-a-little-bit.patch
* x86-elf-move-32-bit-elf_et_dyn_base-to-256mb.patch
* x86-mmap-properly-account-for-stack-randomization-in-mmap_base.patch
* arm64-mmap-properly-account-for-stack-randomization-in-mmap_base.patch
* arm64-move-compat_elf_et_dyn_base-lower-in-the-address-space.patch
* powerpcmmap-properly-account-for-stack-randomization-in-mmap_base.patch
* mm-page_alloc-return-0-in-case-this-node-has-no-page-within-the-zone.patch
* mm-vmscan-do-not-pass-reclaimed-slab-to-vmpressure.patch
* mm-page_owner-align-with-pageblock_nr-pages.patch
* mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
* mm-kasan-use-kasan_zero_pud-for-p4d-table.patch
* mm-kasan-get-rid-of-speculative-shadow-checks.patch
* x86-kasan-dont-allocate-extra-shadow-memory.patch
* arm64-kasan-dont-allocate-extra-shadow-memory.patch
* mm-kasan-add-support-for-memory-hotplug.patch
* mm-kasan-rename-xxx_is_zero-to-xxx_is_nonzero.patch
* frv-remove-wrapper-header-for-asm-deviceh.patch
* frv-use-generic-fbh.patch
* fs-proc-switch-to-ida_simple_get-remove.patch
* randomstackprotect-introduce-get_random_canary-function.patch
* forkrandom-use-get_random_canary-to-set-tsk-stack_canary.patch
* x86-ascii-armor-the-x86_64-boot-init-stack-canary.patch
* arm64-ascii-armor-the-arm64-boot-init-stack-canary.patch
* sh64-ascii-armor-the-sh64-boot-init-stack-canary.patch
* asm-generic-bugh-declare-struct-pt_regs-before-function-prototype.patch
* linux-bugh-correct-formatting-of-block-comment.patch
* linux-bugh-correct-foo-should-be-foo.patch
* linux-bugh-correct-space-required-before-that.patch
* bug-split-build_bug-stuff-out-into-linux-build_bugh.patch
* kernelh-handle-pointers-to-arrays-better-in-container_of.patch
* maintainers-give-proc-sysctl-some-maintainer-love.patch
* kstrtox-delete-end-of-string-test.patch
* kstrtox-use-unsigned-int-more.patch
* lib-interval_tree_test-allow-the-module-to-be-compiled-in.patch
* lib-interval_tree_test-make-test-options-module-parameters.patch
* lib-interval_tree_test-allow-users-to-limit-scope-of-endpoint.patch
* lib-interval_tree_test-allow-full-tree-search.patch
* lib-rhashtablec-use-kvzalloc-in-bucket_table_alloc-when-possible.patch
* add-the-option-of-fortified-stringh-functions.patch
* checkpatch-improve-the-unnecessary-oom-message-test.patch
* checkpatch-warn-when-a-maintainers-entry-isnt-t.patch
* fs-epoll-short-circuit-fetching-events-if-thread-has-been-killed.patch
* seq_file-delete-small-value-optimization.patch
* virtually-mapped-stacks-do-not-disable-interrupts.patch
* kexec-move-vmcoreinfo-out-of-the-kernels-bss-section.patch
* powerpc-fadump-use-the-correct-vmcoreinfo_note_size-for-phdr.patch
* powerpc-fadump-use-the-correct-vmcoreinfo_note_size-for-phdr-fix.patch
* kdump-protect-vmcoreinfo-data-under-the-crash-memory.patch
* kexec-kdump-minor-documentation-updates-for-arm64-and-image.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* sysctl-fix-lax-sysctl_check_table-sanity-check.patch
* sysctl-kdocify-sysctl_writes_strict.patch
* sysctl-fold-sysctl_writes_strict-checks-into-helper.patch
* sysctl-simplify-unsigned-int-support.patch
* sysctl-add-unsigned-int-range-support.patch
* sysctl-check-name-array-length-in-deprecated_sysctl_warning.patch
* test_sysctl-add-dedicated-proc-sysctl-test-driver.patch
* test_sysctl-add-generic-script-to-expand-on-tests.patch
* test_sysctl-test-against-page_size-for-int.patch
* test_sysctl-add-simple-proc_dointvec-case.patch
* test_sysctl-add-simple-proc_douintvec-case.patch
* test_sysctl-test-against-int-proc_dointvec-array-support.patch
* uapi-fix-linux-sysctlh-userspace-compilation-errors.patch
* bfs-fix-sanity-checks-for-empty-files.patch
* fs-kill-config_percpu_rwsem-some-more.patch
* scripts-gdb-add-lx-fdtdump-command.patch
* kfifo-cleanup-example-to-not-use-page_link.patch
* procfs-fdinfo-extend-information-about-epoll-target-files.patch
* kcmp-add-kcmp_epoll_tfd-mode-to-compare-epoll-target-files.patch
* kcmp-fs-epoll-wrap-kcmp-code-with-config_checkpoint_restore.patch
* kernel-reboot-add-devm_register_reboot_notifier.patch
* kernel-reboot-add-devm_register_reboot_notifier-fix.patch
* fault-inject-support-systematic-fault-injection.patch
* fault-inject-support-systematic-fault-injection-fix.patch
* fault-inject-automatically-detect-the-number-base-for-fail-nth-write-interface.patch
* fault-inject-parse-as-natural-1-based-value-for-fail-nth-write-interface.patch
* fault-inject-make-fail-nth-read-write-interface-symmetric.patch
* fault-inject-simplify-access-check-for-fail-nth.patch
* fault-inject-simplify-access-check-for-fail-nth-fix.patch
* fault-inject-add-proc-pid-fail-nth.patch
* ipc-semc-remove-sem_base-embed-struct-sem.patch
* ipc-semc-remove-sem_base-embed-struct-sem-v3.patch
* ipc-merge-ipc_rcu-and-kern_ipc_perm.patch
* ipc-merge-ipc_rcu-and-kern_ipc_perm-fix.patch
* include-linux-semh-correctly-document-sem_ctime.patch
* ipc-drop-non-rcu-allocation.patch
* ipc-sem-do-not-use-ipc_rcu_free.patch
* ipc-shm-do-not-use-ipc_rcu_free.patch
* ipc-msg-do-not-use-ipc_rcu_free.patch
* ipc-util-drop-ipc_rcu_free.patch
* ipc-sem-avoid-ipc_rcu_alloc.patch
* ipc-shm-avoid-ipc_rcu_alloc.patch
* ipc-msg-avoid-ipc_rcu_alloc.patch
* ipc-util-drop-ipc_rcu_alloc.patch
* ipc-semc-avoid-ipc_rcu_putref-for-failed-ipc_addid.patch
* ipc-shmc-avoid-ipc_rcu_putref-for-failed-ipc_addid.patch
* ipc-msgc-avoid-ipc_rcu_putref-for-failed-ipc_addid.patch
* ipc-move-atomic_set-to-where-it-is-needed.patch
* ipc-shm-remove-special-shm_alloc-free.patch
* ipc-msg-remove-special-msg_alloc-free.patch
* ipc-sem-drop-__sem_free.patch
* ipc-utilh-update-documentation-for-ipc_getref-and-ipc_putref.patch
linux-next.patch
linux-next-git-rejects.patch
* netfilter-use-kvmalloc-xt_alloc_table_info.patch
* sparc64-ng4-memset-32-bits-overflow.patch
* xtensa-use-generic-fbh.patch
* lib-crc-ccitt-add-ccitt-false-crc16-variant.patch
mm-add-strictlimit-knob-v2.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
workaround-for-a-pci-restoring-bug.patch
^ permalink raw reply
* Re: linux-next: build warnings after merge of the drm tree
From: Stephen Rothwell @ 2017-06-02 23:40 UTC (permalink / raw)
To: Eric Anholt
Cc: Dave Airlie, Linux-Next Mailing List, Linux Kernel Mailing List,
Tom Cooksey, Daniel Vetter, Linus Walleij, Arnd Bergmann,
Caesar Wang, Mark Yao
In-Reply-To: <87poem85it.fsf@eliezer.anholt.net>
Hi Eric,
On Fri, 02 Jun 2017 14:05:14 -0700 Eric Anholt <eric@anholt.net> wrote:
>
> Not sure what's going on. I see your "yesterday" list present, and not
> your "today" commit.
I just refetched the drm-misc tree and received no changes. It is
still as I said in the previous email. This tree is fetched from the
drm-misc-next branch of git://anongit.freedesktop.org/drm/drm-misc
The single commit currently in that branch was authored by "Caesar Wang
<wxt@rock-chips.com>" and committed by "Mark Yao
<mark.yao@rock-chips.com>" (both now cc'd).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build warnings after merge of the drm tree
From: Eric Anholt @ 2017-06-03 0:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Linux-Next Mailing List, Linux Kernel Mailing List,
Tom Cooksey, Daniel Vetter, Linus Walleij, Arnd Bergmann,
Caesar Wang, Mark Yao
In-Reply-To: <20170603094037.7aa077d9@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 689 bytes --]
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Eric,
>
> On Fri, 02 Jun 2017 14:05:14 -0700 Eric Anholt <eric@anholt.net> wrote:
>>
>> Not sure what's going on. I see your "yesterday" list present, and not
>> your "today" commit.
>
> I just refetched the drm-misc tree and received no changes. It is
> still as I said in the previous email. This tree is fetched from the
> drm-misc-next branch of git://anongit.freedesktop.org/drm/drm-misc
>
> The single commit currently in that branch was authored by "Caesar Wang
> <wxt@rock-chips.com>" and committed by "Mark Yao
> <mark.yao@rock-chips.com>" (both now cc'd).
I see that commit in drm-misc-next-fixes, but not drm-misc-next.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply
* Re: linux-next: build warnings after merge of the drm tree
From: Stephen Rothwell @ 2017-06-03 1:26 UTC (permalink / raw)
To: Eric Anholt
Cc: Dave Airlie, Linux-Next Mailing List, Linux Kernel Mailing List,
Tom Cooksey, Daniel Vetter, Linus Walleij, Arnd Bergmann,
Caesar Wang, Mark Yao
In-Reply-To: <8737bhlx0p.fsf@eliezer.anholt.net>
Hi Eric,
On Fri, 02 Jun 2017 17:45:10 -0700 Eric Anholt <eric@anholt.net> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
> > On Fri, 02 Jun 2017 14:05:14 -0700 Eric Anholt <eric@anholt.net> wrote:
> >>
> >> Not sure what's going on. I see your "yesterday" list present, and not
> >> your "today" commit.
> >
> > I just refetched the drm-misc tree and received no changes. It is
> > still as I said in the previous email. This tree is fetched from the
> > drm-misc-next branch of git://anongit.freedesktop.org/drm/drm-misc
> >
> > The single commit currently in that branch was authored by "Caesar Wang
> > <wxt@rock-chips.com>" and committed by "Mark Yao
> > <mark.yao@rock-chips.com>" (both now cc'd).
>
> I see that commit in drm-misc-next-fixes, but not drm-misc-next.
I see it in the drm-misc-fixes tree (branch for-linux-next-fixes) as
well (along with another commit).
I made a mistake above, the drm-misc tree is branch for-linux-next.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: [PATCH] staging: rtl8188eu: style fixes
From: Greg Kroah-Hartman @ 2017-06-03 8:18 UTC (permalink / raw)
To: Galo; +Cc: linux-next, Larry Finger
In-Reply-To: <20170602143643.GA9038@lear>
On Fri, Jun 02, 2017 at 04:36:44PM +0200, Galo wrote:
> Fix several "CHECK: spaces preferred around that .." checks.
>
> Signed-off-by: Galo Navarro <anglor@varoa.net>
This name doesn't match the name in your "From:" line in your email :(
^ permalink raw reply
* Investment Interest & Offer
From: Seydou Thieba @ 2017-06-02 23:01 UTC (permalink / raw)
To: Recipients
^ permalink raw reply
* linux-next: manual merge of the at91 tree with the arm-soc tree
From: Stephen Rothwell @ 2017-06-04 23:48 UTC (permalink / raw)
To: Nicolas Ferre, Olof Johansson, Arnd Bergmann, ARM
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Alexandre Belloni, Szemző András
Hi Nicolas,
Today's linux-next merge of the at91 tree got a conflict in:
arch/arm/mach-at91/Kconfig
between commit:
cc7a938f5f30 ("ARM: at91: select CONFIG_ARM_CPU_SUSPEND")
from the arm-soc tree and commit:
81c0bb0b6ad1 ("ARM: at91: Add armv7m support")
from the at91 tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/mach-at91/Kconfig
index cbd959b73654,7497a28a79d1..000000000000
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@@ -1,7 -1,6 +1,7 @@@
menuconfig ARCH_AT91
bool "Atmel SoCs"
- depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7
+ depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7 || ARM_SINGLE_ARMV7M
+ select ARM_CPU_SUSPEND if PM
select COMMON_CLK_AT91
select GPIOLIB
select PINCTRL
^ permalink raw reply
* linux-next: build failure after merge of the clk tree
From: Stephen Rothwell @ 2017-06-05 0:14 UTC (permalink / raw)
To: Mike Turquette, Stephen Boyd
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
Hi all,
After merging the clk tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/clk/at91/clk-generated.c: In function 'at91_clk_register_generated':
drivers/clk/at91/clk-generated.c:273:20: error: invalid storage class for function 'of_sama5d2_clk_generated_setup'
static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
^
drivers/clk/at91/clk-generated.c:273:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
^
In file included from include/linux/clk-provider.h:15:0,
from drivers/clk/at91/clk-generated.c:14:
include/linux/of.h:1132:16: error: initializer element is not constant
.data = (fn == (fn_type)NULL) ? fn : fn }
^
include/linux/of.h:1146:3: note: in expansion of macro '_OF_DECLARE'
_OF_DECLARE(table, name, compat, fn, of_init_fn_1)
^
include/linux/clk-provider.h:791:42: note: in expansion of macro 'OF_DECLARE_1'
#define CLK_OF_DECLARE(name, compat, fn) OF_DECLARE_1(clk, name, compat, fn)
^
drivers/clk/at91/clk-generated.c:321:1: note: in expansion of macro 'CLK_OF_DECLARE'
CLK_OF_DECLARE(of_sama5d2_clk_generated_setup, "atmel,sama5d2-clk-generated",
^
include/linux/of.h:1132:16: note: (near initialization for '__of_table_of_sama5d2_clk_generated_setup.data')
.data = (fn == (fn_type)NULL) ? fn : fn }
^
include/linux/of.h:1146:3: note: in expansion of macro '_OF_DECLARE'
_OF_DECLARE(table, name, compat, fn, of_init_fn_1)
^
include/linux/clk-provider.h:791:42: note: in expansion of macro 'OF_DECLARE_1'
#define CLK_OF_DECLARE(name, compat, fn) OF_DECLARE_1(clk, name, compat, fn)
^
drivers/clk/at91/clk-generated.c:321:1: note: in expansion of macro 'CLK_OF_DECLARE'
CLK_OF_DECLARE(of_sama5d2_clk_generated_setup, "atmel,sama5d2-clk-generated",
^
include/linux/of.h:1129:22: error: expected declaration or statement at end of input
static const struct of_device_id __of_table_##name \
^
include/linux/of.h:1146:3: note: in expansion of macro '_OF_DECLARE'
_OF_DECLARE(table, name, compat, fn, of_init_fn_1)
^
include/linux/clk-provider.h:791:42: note: in expansion of macro 'OF_DECLARE_1'
#define CLK_OF_DECLARE(name, compat, fn) OF_DECLARE_1(clk, name, compat, fn)
^
drivers/clk/at91/clk-generated.c:321:1: note: in expansion of macro 'CLK_OF_DECLARE'
CLK_OF_DECLARE(of_sama5d2_clk_generated_setup, "atmel,sama5d2-clk-generated",
^
Caused by commit
8e56133e5c7b ("clk: at91: fix clk-generated parenting")
A closing brace was lost ...
I have used the clk tree from next-20170602 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build warning after merge of the i2c tree
From: Stephen Rothwell @ 2017-06-05 1:11 UTC (permalink / raw)
To: Wolfram Sang; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
Hi Wolfram,
After merging the i2c tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:
drivers/i2c/i2c-stub.c:18:0: warning: "DEBUG" redefined
#define DEBUG
^
<command-line>:0:0: note: this is the location of the previous definition
Introduced by commit
6c42778780c4 ("i2c: stub: use pr_fmt")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the v4l-dvb tree with the v4l-dvb-fixes tree
From: Stephen Rothwell @ 2017-06-05 2:03 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Hans Verkuil,
Arnd Bergmann
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
include/media/cec-notifier.h
between commit:
e94c32818d86 ("[media] cec: rename MEDIA_CEC_NOTIFIER to CEC_NOTIFIER")
from the v4l-dvb-fixes tree and commit:
79eddc992ea4 ("[media] cec-notifier.h: handle unreachable CONFIG_CEC_CORE")
from the v4l-dvb tree.
I fixed it up (I just used the former version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the drm tree with Linus' tree
From: Stephen Rothwell @ 2017-06-05 2:49 UTC (permalink / raw)
To: Dave Airlie
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Jani Nikula
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_dp.c
between commit:
8001b7541aa7 ("drm/i915/dp: rename rate_to_index() to intel_dp_rate_index() and reuse")
from Linus' tree and commit:
3194102439f6 ("drm/i915/dp: use known correct array size in rate_to_index")
from the drm tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/i915/intel_dp.c
index fc691b8b317c,4a6feb6a69bd..000000000000
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -1507,17 -1548,37 +1548,6 @@@ static void intel_dp_print_rates(struc
DRM_DEBUG_KMS("common rates: %s\n", str);
}
- static int rate_to_index(int find, const int *rates)
-bool
-__intel_dp_read_desc(struct intel_dp *intel_dp, struct intel_dp_desc *desc)
--{
- int i = 0;
- u32 base = drm_dp_is_branch(intel_dp->dpcd) ? DP_BRANCH_OUI :
- DP_SINK_OUI;
--
- for (i = 0; i < DP_MAX_SUPPORTED_RATES; ++i)
- if (find == rates[i])
- break;
- return drm_dp_dpcd_read(&intel_dp->aux, base, desc, sizeof(*desc)) ==
- sizeof(*desc);
-}
--
- return i;
-bool intel_dp_read_desc(struct intel_dp *intel_dp)
-{
- struct intel_dp_desc *desc = &intel_dp->desc;
- bool oui_sup = intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] &
- DP_OUI_SUPPORT;
- int dev_id_len;
-
- if (!__intel_dp_read_desc(intel_dp, desc))
- return false;
-
- dev_id_len = strnlen(desc->device_id, sizeof(desc->device_id));
- DRM_DEBUG_KMS("DP %s: OUI %*phD%s dev-ID %*pE HW-rev %d.%d SW-rev %d.%d\n",
- drm_dp_is_branch(intel_dp->dpcd) ? "branch" : "sink",
- (int)sizeof(desc->oui), desc->oui, oui_sup ? "" : "(NS)",
- dev_id_len, desc->device_id,
- desc->hw_rev >> 4, desc->hw_rev & 0xf,
- desc->sw_major_rev, desc->sw_minor_rev);
-
- return true;
--}
--
int
intel_dp_max_link_rate(struct intel_dp *intel_dp)
{
@@@ -1587,16 -1654,13 +1623,15 @@@ intel_dp_compute_config(struct intel_en
/* Conveniently, the link BW constants become indices with a shift...*/
int min_clock = 0;
int max_clock;
- int link_rate_index;
int bpp, mode_rate;
int link_avail, link_clock;
- int common_rates[DP_MAX_SUPPORTED_RATES] = {};
int common_len;
uint8_t link_bw, rate_select;
+ bool reduce_m_n = drm_dp_has_quirk(&intel_dp->desc,
+ DP_DPCD_QUIRK_LIMITED_M_N);
- common_len = intel_dp_common_rates(intel_dp, common_rates);
+ common_len = intel_dp_common_len_rate_limit(intel_dp,
+ intel_dp->max_link_rate);
/* No common link rates between source and sink */
WARN_ON(common_len <= 0);
^ permalink raw reply
* Re: linux-next: build failure after merge of the mfd tree
From: Stephen Rothwell @ 2017-06-05 3:28 UTC (permalink / raw)
To: Lee Jones
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Heikki Krogerus, Greg Kroah-Hartman, Kuppuswamy Sathyanarayanan
In-Reply-To: <20170531122332.3f573f1d@canb.auug.org.au>
Hi Lee,
On Wed, 31 May 2017 12:23:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/usb/typec/typec_wcove.c: In function 'wcove_typec_pr
> obe':
> drivers/usb/typec/typec_wcove.c:306:32: error: 'struct intel_soc_pmic' has no member named 'irq_chip_data_level2'
> ret = regmap_irq_get_virq(pmic->irq_chip_data_level2,
> ^
>
> Caused by commit
>
> aa32452e6ef9 ("mfd: intel_soc_pmic_bxtwc: Use chained irqs for second level irq chips")
>
> interacting with commit
>
> d2061f9cc32d ("usb: typec: add driver for Intel Whiskey Cove PMIC USB Type-C PHY")
>
> from Linus' tree (v4.12-rc1). grep is your friend. :-)
>
> I have used the mfd tree from next-20170530 for today.
I am still getting this failure.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the staging tree with the tty tree
From: Stephen Rothwell @ 2017-06-05 4:57 UTC (permalink / raw)
To: Greg KH
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Okash Khawaja,
Alan Cox
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
include/uapi/linux/tty.h
between commit:
8a8dabf2dd68 ("tty: handle the case where we cannot restore a line discipline")
from the tty tree and commit:
1ab92da32e37 ("staging: speakup: add tty-based comms functions")
from the staging tree.
I fixed it up (I used the tty tree version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build warnings after merge of the uuid tree
From: Stephen Rothwell @ 2017-06-05 6:09 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Andy Shevchenko
Hi Christoph,
After merging the uuid tree, today's linux-next build (arm
multi_v7_defconfig and x86_64 allmodconfig) produced these warnings:
In file included from drivers/usb/dwc2/core.h:45:0,
from drivers/usb/dwc2/core_intr.c:53:
drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
#define GUID HSOTG_REG(0x003c)
^
In file included from include/linux/uuid.h:19:0,
from include/linux/fs.h:33,
from include/linux/seq_file.h:10,
from include/linux/pinctrl/consumer.h:17,
from include/linux/pinctrl/devinfo.h:21,
from include/linux/device.h:24,
from include/linux/dma-mapping.h:6,
from drivers/usb/dwc2/core_intr.c:45:
include/uapi/linux/uuid.h:27:0: note: this is the location of the previous definition
#define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
^
In file included from drivers/usb/dwc2/core.h:45:0,
from drivers/usb/dwc2/core.c:56:
drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
#define GUID HSOTG_REG(0x003c)
^
In file included from include/linux/uuid.h:19:0,
from include/linux/fs.h:33,
from include/linux/seq_file.h:10,
from include/linux/pinctrl/consumer.h:17,
from include/linux/pinctrl/devinfo.h:21,
from include/linux/device.h:24,
from include/linux/dma-mapping.h:6,
from drivers/usb/dwc2/core.c:47:
include/uapi/linux/uuid.h:27:0: note: this is the location of the previous definition
#define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
^
In file included from drivers/usb/dwc2/core.h:45:0,
from drivers/usb/dwc2/platform.c:52:
drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
#define GUID HSOTG_REG(0x003c)
^
In file included from include/linux/uuid.h:19:0,
from include/linux/fs.h:33,
from include/linux/seq_file.h:10,
from include/linux/pinctrl/consumer.h:17,
from include/linux/pinctrl/devinfo.h:21,
from include/linux/device.h:24,
from drivers/usb/dwc2/platform.c:41:
include/uapi/linux/uuid.h:27:0: note: this is the location of the previous definition
#define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
^
In file included from drivers/usb/dwc2/core.h:45:0,
from drivers/usb/dwc2/params.c:39:
drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
#define GUID HSOTG_REG(0x003c)
^
In file included from include/linux/uuid.h:19:0,
from include/linux/fs.h:33,
from include/linux/seq_file.h:10,
from include/linux/pinctrl/consumer.h:17,
from include/linux/pinctrl/devinfo.h:21,
from include/linux/device.h:24,
from include/linux/node.h:17,
from include/linux/cpu.h:16,
from include/linux/of_device.h:4,
from drivers/usb/dwc2/params.c:37:
include/uapi/linux/uuid.h:27:0: note: this is the location of the previous definition
#define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
^
In file included from drivers/usb/dwc2/core.h:45:0,
from drivers/usb/dwc2/hcd.c:55:
drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
#define GUID HSOTG_REG(0x003c)
^
In file included from include/linux/uuid.h:19:0,
from include/linux/fs.h:33,
from include/linux/seq_file.h:10,
from include/linux/pinctrl/consumer.h:17,
from include/linux/pinctrl/devinfo.h:21,
from include/linux/device.h:24,
from include/linux/platform_device.h:14,
from drivers/usb/dwc2/hcd.c:45:
include/uapi/linux/uuid.h:27:0: note: this is the location of the previous definition
#define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
^
In file included from drivers/usb/dwc2/core.h:45:0,
from drivers/usb/dwc2/hcd_intr.c:52:
drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
#define GUID HSOTG_REG(0x003c)
^
In file included from include/linux/uuid.h:19:0,
from include/linux/fs.h:33,
from include/linux/seq_file.h:10,
from include/linux/pinctrl/consumer.h:17,
from include/linux/pinctrl/devinfo.h:21,
from include/linux/device.h:24,
from include/linux/dma-mapping.h:6,
from drivers/usb/dwc2/hcd_intr.c:44:
include/uapi/linux/uuid.h:27:0: note: this is the location of the previous definition
#define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
^
In file included from drivers/usb/dwc2/core.h:45:0,
from drivers/usb/dwc2/hcd_queue.c:54:
drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
#define GUID HSOTG_REG(0x003c)
^
In file included from include/linux/uuid.h:19:0,
from include/linux/fs.h:33,
from include/linux/seq_file.h:10,
from include/linux/pinctrl/consumer.h:17,
from include/linux/pinctrl/devinfo.h:21,
from include/linux/device.h:24,
from include/linux/dma-mapping.h:6,
from drivers/usb/dwc2/hcd_queue.c:46:
include/uapi/linux/uuid.h:27:0: note: this is the location of the previous definition
#define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
^
In file included from drivers/usb/dwc2/core.h:45:0,
from drivers/usb/dwc2/hcd_ddma.c:52:
drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
#define GUID HSOTG_REG(0x003c)
^
In file included from include/linux/uuid.h:19:0,
from include/linux/fs.h:33,
from include/linux/seq_file.h:10,
from include/linux/pinctrl/consumer.h:17,
from include/linux/pinctrl/devinfo.h:21,
from include/linux/device.h:24,
from include/linux/dma-mapping.h:6,
from drivers/usb/dwc2/hcd_ddma.c:44:
include/uapi/linux/uuid.h:27:0: note: this is the location of the previous definition
#define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
^
In file included from drivers/usb/dwc2/core.h:45:0,
from drivers/usb/dwc2/debugfs.c:22:
drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
#define GUID HSOTG_REG(0x003c)
^
In file included from include/linux/uuid.h:19:0,
from include/linux/fs.h:33,
from include/linux/debugfs.h:18,
from drivers/usb/dwc2/debugfs.c:18:
include/uapi/linux/uuid.h:27:0: note: this is the location of the previous definition
#define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
^
In file included from drivers/usb/dwc2/core.h:45:0,
from drivers/usb/dwc2/gadget.c:34:
drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
#define GUID HSOTG_REG(0x003c)
^
In file included from include/linux/uuid.h:19:0,
from include/linux/fs.h:33,
from include/linux/seq_file.h:10,
from include/linux/pinctrl/consumer.h:17,
from include/linux/pinctrl/devinfo.h:21,
from include/linux/device.h:24,
from include/linux/platform_device.h:14,
from drivers/usb/dwc2/gadget.c:21:
include/uapi/linux/uuid.h:27:0: note: this is the location of the previous definition
#define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
^
Introduced by commit
e0a74cd0a2d4 ("uuid: rename uuid types")
GUID is used in at least 2 other files as well :-(
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the tty tree
From: Greg KH @ 2017-06-05 6:50 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Okash Khawaja,
Alan Cox
In-Reply-To: <20170605145749.4d6df5cd@canb.auug.org.au>
On Mon, Jun 05, 2017 at 02:57:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> include/uapi/linux/tty.h
>
> between commit:
>
> 8a8dabf2dd68 ("tty: handle the case where we cannot restore a line discipline")
>
> from the tty tree and commit:
>
> 1ab92da32e37 ("staging: speakup: add tty-based comms functions")
>
> from the staging tree.
>
> I fixed it up (I used the tty tree version) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
I'm the maintainer of both, I knew this would happen and made it so it
was obvious what version to take :)
thanks,
greg k-h
^ permalink raw reply
* linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2017-06-05 7:01 UTC (permalink / raw)
To: Andrew Morton
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Daniel Micay,
Kees Cook
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (x86_64
allmodconfig) failed like this:
sound/pcmcia/pdaudiocf/pdaudiocf.o: warning: objtool: .text: unexpected end of section
arch/x86/ras/mce_amd_inj.o: warning: objtool: inj_readme_read() falls through to next function extcpu_fops_open()
sound/sound_core.o: warning: objtool: register_sound_special_device() falls through to next function register_sound_special()
and many more like those. Also:
In file included from /home/sfr/next/next/include/linux/bitmap.h:8:0,
from /home/sfr/next/next/include/linux/cpumask.h:11,
from /home/sfr/next/next/arch/x86/include/asm/cpumask.h:4,
from /home/sfr/next/next/arch/x86/include/asm/msr.h:10,
from /home/sfr/next/next/arch/x86/include/asm/processor.h:20,
from /home/sfr/next/next/arch/x86/include/asm/cpufeature.h:4,
from /home/sfr/next/next/arch/x86/include/asm/thread_info.h:52,
from /home/sfr/next/next/include/linux/thread_info.h:37,
from /home/sfr/next/next/arch/x86/include/asm/preempt.h:6,
from /home/sfr/next/next/include/linux/preempt.h:80,
from /home/sfr/next/next/include/linux/spinlock.h:50,
from /home/sfr/next/next/include/linux/mmzone.h:7,
from /home/sfr/next/next/include/linux/gfp.h:5,
from /home/sfr/next/next/arch/x86/power/hibernate_64.c:11:
In function 'memcpy',
inlined from 'relocate_restore_code' at /home/sfr/next/next/arch/x86/power/hibernate_64.c:150:2,
inlined from 'swsusp_arch_resume' at /home/sfr/next/next/arch/x86/power/hibernate_64.c:185:8:
/home/sfr/next/next/include/linux/string.h:309:4: error: call to '__read_overflow2' declared with attribute error: detected read beyond size of object passed as 2nd parameter
__read_overflow2();
^
Caused by commit
088a5ecf7581 ("include/linux/string.h: add the option of fortified string.h functions")
We really need to fix all the known problems it detects *before*
merging this commit ...
I have reverted it for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: Tree for Jun 5
From: Stephen Rothwell @ 2017-06-05 7:19 UTC (permalink / raw)
To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List
Hi all,
Changes since 20170602:
New tree: uuid
The at91 tree gained a conflict against the arm-soc tree.
The clk tree gained a build failure, so I used the version from
next-20170602.
The v4l-dvb tree gained a conflict against the v4l-dvb-fixes tree.
The drm tree gained a conflict against Linus' tree,
The mfd tree still had its build failure so I used the version from
next-20170530.
The staging tree gained a conflict against the tty tree.
The target-bva tree is fixed.
The akpm-current tree gained a build failure for which I reverted
a commit.
Non-merge commits (relative to Linus' tree): 4022
4278 files changed, 166750 insertions(+), 91063 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 264 trees (counting Linus' and 41 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (125f42b0e226 Merge tag 'nfs-for-4.12-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs)
Merging fixes/master (97da3854c526 Linux 4.11-rc3)
Merging kbuild-current/fixes (05d8cba4a1e8 kbuild: skip install/check of headers right under uapi directories)
Merging arc-current/for-curr (a4da5b17736d arc: Set IO-coherency aperture base to LINUX_LINK_BASE)
Merging arm-current/fixes (9861991321ec ARM: 8677/1: boot/compressed: fix decompressor header layout for v7-M)
Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (0e5e7f5e9700 powerpc/64: Reclaim CPU_FTR_SUBCORE)
Merging sparc/master (0fde7ad71ee3 sparc64: Fix build warnings with gcc 7.)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (f0c3192ceee3 virtio_net: lower limit on buffer size)
Merging ipsec/master (a486cd23661c xfrm: fix state migration copy replay sequence numbers)
Merging netfilter/master (468b0df61a51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections)
Merging wireless-drivers/master (6d18c732b95c bridge: start hello_timer when enabling KERNEL_STP in br_stp_start)
Merging mac80211/master (e165bc02a02c mac80211: fix dropped counter in multiqueue RX)
Merging sound-current/for-linus (d2c3b14e1f0d ALSA: hda - Fix applying MSI dual-codec mobo quirk)
Merging pci-current/for-linus (bd2df9b1e094 PCI: Make error code types consistent in pci_{read,write}_config_*)
Merging driver-core.current/driver-core-linus (08332893e37a Linux 4.12-rc2)
Merging tty.current/tty-linus (fc098af16b9f Revert "tty: fix port buffer locking")
Merging usb.current/usb-linus (29532e7b67f0 Merge tag 'phy-for-4.12-rc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-linus)
Merging usb-gadget-fixes/fixes (afbbc7913a28 usb: gadget: udc: renesas_usb3: Fix PN_INT_ENA disabling timing)
Merging usb-serial-fixes/usb-linus (5ed02dbb4974 Linux 4.12-rc3)
Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show)
Merging phy/fixes (9605bc46433d phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer)
Merging staging.current/staging-linus (0a33252e060e staging/lustre/lov: remove set_fs() call from lov_getstripe())
Merging char-misc.current/char-misc-linus (6f9193ec044a mei: make sysfs modalias format similar as uevent modalias)
Merging input-current/for-linus (0fd5f2210938 Input: axp20x-pek - switch to acpi_dev_present and check for ACPI0011 too)
Merging crypto-current/master (f3ad587070d6 crypto: gcm - wait for crypto op not signal safe)
Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination)
Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6)
Merging kselftest-fixes/fixes (2ea659a9ef48 Linux 4.12-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging nand-fixes/nand/fixes (d4ed3b9015b5 mtd: nand: make nand_ooblayout_lp_hamming_ops static)
Merging spi-nor-fixes/spi-nor/fixes (2ea659a9ef48 Linux 4.12-rc1)
Merging mfd-fixes/for-mfd-fixes (b2376407f989 mfd: cros-ec: Fix host command buffer size)
Merging v4l-dvb-fixes/fixes (963761a0b2e8 [media] rc-core: race condition during ir_raw_event_register())
Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded)
Merging drm-intel-fixes/for-linux-next-fixes (9bd9590997b9 drm/i915: Stop pretending to mask/unmask LPE audio interrupts)
Merging drm-misc-fixes/for-linux-next-fixes (75fb636324a8 drm: Fix oops + Xserver hang when unplugging USB drm devices)
Merging kbuild/for-next (547b9255cde5 Merge branch 'fixes' into for-next)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging arm/for-next (e8fa27d7428e Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (2ea659a9ef48 Linux 4.12-rc1)
Merging arm-soc/for-next (74962b38a6d1 Document merges)
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
Merging amlogic/for-next (69f33fe16f5d Merge branch 'v4.13/defconfig' into tmp/aml-rebuild)
Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next)
Merging at91/at91-next (630efea351f0 Merge branch 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
CONFLICT (content): Merge conflict in arch/arm/mach-at91/Kconfig
Merging bcm2835/for-next (c156bb73ae01 Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (428c917deaaf Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (b45371147f9d Merge branch 'for_4.13/keystone_dts' into next)
Merging mvebu/for-next (e629b4b1c763 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (78f9b622f8a9 Merge branch 'omap-for-v4.13/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging reset/reset/next (cae285ea12b5 dt-bindings: reset: Add reset manager offsets for Stratix10)
Merging qcom/for-next (bca31d5e9dcb Merge branch 'arm64-for-4.13' into all-for-4.13)
Merging realtek/realtek/for-next (3d7f2ce10cb3 Merge branch 'realtek/v4.13/dt64' into next)
Merging renesas/next (bfcadd8730e0 Merge branches 'arm64-dt-for-v4.13' and 'dt-for-v4.13' into next)
Merging rockchip/for-next (dd3f24b9ff88 Merge branch 'v4.13-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging samsung-krzk/for-next (3cd885f16313 Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (efea15db3f04 Merge branch 'sunxi/dt-for-4.13' into sunxi/for-next)
Merging tegra/for-next (29d04525797f Merge branch for-4.12/clk into for-next)
Merging arm64/for-next/core (1151f838cb62 arm64: kernel: restrict /dev/mem read() calls to linear region)
Merging clk/clk-next (cfe76a28e371 clk: versatile: delete old RealView clock implementation)
$ git reset --hard HEAD^
Merging next-20170602 version of clk
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (1072734a2c63 m68k/defconfig: Update defconfigs for v4.12-rc1)
Merging m68knommu/for-next (5ed02dbb4974 Linux 4.12-rc3)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
Merging microblaze/next (83f0124ad81e microblaze: remove asm-generic wrapper headers)
Merging mips/mips-for-linux-next (bc53f9c58065 Merge branch '4.12-fixes' into mips-for-linux-next)
Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation)
Merging openrisc/for-next (8d797f3169d1 openrisc: explicitly include linux/bug.h in asm/fixmap.h)
Merging parisc-hd/for-next (5aa2aabff1ce parisc: Stop CPUs via PAT firmware before system halt or reboot.)
Merging powerpc/next (83a092cf95f2 powerpc: Link warning for orphan sections)
Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (caf40f52ac5a s390/dasd: Display read-only attribute correctly)
Merging sparc-next/master (60925ee97e2b Merge branch 'sparc64-queued-locks')
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory)
Merging uml/linux-next (ce4586063f1a um: Add missing NR_CPUS include)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6fad04b7585d Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (6f9d696f016f fscrypt: correct collision claim for digested names)
Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (4a44f70d220c Merge branch 'for-next-next-v4.13-20170531' into for-next-20170531)
Merging ceph/master (6ac56951dc10 rbd: implement REQ_OP_WRITE_ZEROES)
Merging cifs/for-next (a95cfad947d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (d8747d642ec4 reiserfs: Make flush bios explicitely sync)
Merging ext4/dev (67a7d5f561f4 ext4: fix fdatasync(2) after extent manipulation operations)
Merging f2fs/dev (1b7d8dd63b27 f2fs: fix a panic caused by NULL flush_cmd_control)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (0b6e9ea041e6 fuse: Add support for pid namespaces)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (6ea44adce915 SUNRPC: ensure correct error is reported by xs_tcp_setup_socket())
Merging nfsd/nfsd-next (bb2a8b0cd116 nfsd4: const-ify nfsd4_ops)
Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
Merging overlayfs/overlayfs-next (a082c6f680da ovl: filter trusted xattr for non-admin)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (7bccd12d27b7 ubi: Add debugfs file for tracking PEB state)
Merging xfs/for-next (161f55efba5d xfs: fix use-after-free in xfs_finish_page_writeback)
Merging file-locks/linux-next (94073ad77fff fs/locks: don't mess with the address limit in compat_fcntl64)
Merging vfs/for-next (919bb328b020 Merge branch 'work.misc' into for-next)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (719f6a7040f1 printk: Use the main logbuf in NMI when logbuf_lock is available)
Merging pci/next (c823e5b95885 Merge branch 'pci/host-xilinx' into next)
Merging pstore/for-next/pstore (d3762358a739 pstore: Fix format string to use %u for record id)
Merging hid/for-next (e52f086b62b3 Merge branch 'for-4.12/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (f9831bfec741 i2c: mxs: change error printing to debug for mxs_i2c_pio_wait_xfer_end)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (b3398adc0da6 firmware: dmi_scan: Look for SMBIOS 3 entry point first)
Merging hwmon-staging/hwmon-next (7e27b1d21d7a hwmon: (scpi) Fix the scale of SCP sensor readings)
Merging jc_docs/docs-next (6312811be26f Merge remote-tracking branch 'mauro-exp/docbook3' into death-to-docbook)
Merging v4l-dvb/master (af3a8480646c [media] uvcvideo: annotate a switch fall through)
CONFLICT (content): Merge conflict in include/media/cec-notifier.h
CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/i2c/ov5693/Makefile
CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/i2c/imx/Makefile
CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/i2c/Makefile
Merging v4l-dvb-next/master (791a9a666d1a Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging fbdev/fbdev-for-next (34bf129a7f06 fbdev: sti: don't select CONFIG_VT)
Merging pm/linux-next (0ab35512dd7c Merge branch 'pm-cpufreq' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (cb15c81a0c1c Merge branch 'thermal-soc' into next)
Merging thermal-soc/next (33011c583fcc Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (591c3beb86c4 dlm: Delete an unnecessary variable initialisation in dlm_ls_start())
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (030a89028db0 net: phy: smsc: Implement PHY statistics)
CONFLICT (content): Merge conflict in drivers/net/phy/marvell.c
Merging ipsec-next/master (d49c9dc1c848 ipv6: remove unused variables in esp6)
Merging netfilter-next/master (34158151d2aa netfilter: cttimeout: use nf_ct_iterate_cleanup_net to unlink timeout objs)
Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period)
Merging wireless-drivers-next/master (219569ad0c41 rsi: use subdirectory for firmware file)
Merging bluetooth/master (a3995460491d net: phy: Relax error checking on sysfs_create_link())
Merging mac80211-next/master (5d473fedd17a mac80211: Invoke TX LED in more code paths)
Merging rdma/for-next (5ed02dbb4974 Linux 4.12-rc3)
Merging gfs2/for-next (3ef2bc099d1c Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux)
Merging mtd/master (05e97a9eda72 Merge tag 'nand/fixes-for-4.12-rc3' of git://git.infradead.org/linux-mtd into MTD)
Merging l2-mtd/master (44225c9c79ae mtd: mchp23k256: switch to mtd_device_register())
Merging nand/nand/next (30ee809e980b mtd: nand: mediatek: add support for MT2712 NAND FLASH Controller)
Merging spi-nor/spi-nor/next (05d090f00203 mtd: spi-nor: Potential oops on error path in quad_enable())
Merging crypto/master (284e76387c38 hw_random: timeriomem_rng: Allow setting RNG quality from platform data)
Merging drm/drm-next (2a1720376add Backmerge tag 'v4.12-rc3' into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_shrinker.c
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (938361e7a506 drm/i915/cnp: Panel Power sequence changes for CNP PCH.)
Merging drm-tegra/drm/tegra/for-next (b0d36daa0ab5 gpu: host1x: Fix host1x driver shutdown)
Merging drm-misc/for-linux-next (2d7b56378d32 drm/rockchip: gem: add the lacks lock and trivial changes)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (98db803f6413 msm/drm: gpu: Dynamically locate the clocks from the device tree)
Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address)
Merging mali-dp/for-upstream/mali-dp (763656d30b3d drm: mali-dp: use div_u64 for expensive 64-bit divisions)
Merging sunxi-drm/sunxi-drm/for-next (110d33dd428e drm/sun4i: Add compatible for the A10s pipeline)
Merging imx-drm/imx-drm/next (b8f0951de854 gpu: ipu-v3: prg: remove counter load enable)
Merging etnaviv/etnaviv/next (46a269da7e8a drm/etnaviv: restore ETNA_PREP_NOSYNC behaviour)
Merging kspp/for-next/kspp (4b49d6a66b06 Merge branch 'for-next/gcc-plugin/randstruct' into for-next/kspp)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (7421a1671abe ALSA: pcm: include pcm_local.h and remove some extraneous tabs)
Merging sound-asoc/for-next (aed323d42578 Merge remote-tracking branches 'asoc/topic/stm32', 'asoc/topic/sunxi', 'asoc/topic/tlv320dac31xx' and 'asoc/topic/wm-adsp' into asoc-next)
Merging modules/modules-next (3e2e857f9c3a module: Add module name to modinfo)
Merging input/next (086cebfa72fa Input: s3c2410_ts - handle return value of clk_prepare_enable)
Merging block/for-next (fe02d46ab775 Merge branch 'for-4.13/block' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (d8fc98f845c9 dm kcopyd: add sequential write feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (6e75316c15df mmc: tmio: make sure SDIO gets reinitialized after resume)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (01d3de55aa26 md: simplify code with bio_io_error)
Merging mfd/for-mfd-next (60194d283dcf mfd: intel_quark_i2c_gpio: Add support for SIMATIC IOT2000 platform)
$ git reset --hard HEAD^
Merging next-20170530 version of mfd
Merging backlight/for-backlight-next (e739c5bb20be backlight: Add support for Arctic Sand LED backlight driver chips)
Merging battery/for-next (b5910897b2ee power_supply: Add Apple Brick ID power supply type)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (af7a73de20f9 Merge remote-tracking branches 'regulator/topic/settle' and 'regulator/topic/tps65917' into regulator-next)
Merging security/next (d68c51e0b377 Sync to mainline for security submaintainers to work against)
Merging integrity/next (89e54ebf27d4 ima: Add cgroups2 to the defaults list)
Merging keys/keys-next (e36484b5ac31 crypto : asymmetric_keys : verify_pefile:zero memory content before freeing)
Merging selinux/next (8e71bf75efce selinux: use pernet operations for hook registration)
Merging tpmdd/next (ffd526e290f1 tpm: vtpm_proxy: Suppress error logging when in closed state)
Merging watchdog/master (08332893e37a Linux 4.12-rc2)
Merging iommu/next (752b80575ea4 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/core', 'x86/vt-d' and 'x86/amd' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (7cb671e7a34d vfio/type1: Reduce repetitive calls in vfio_pin_pages_remote())
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
Merging audit/next (7786f6b6dfc1 audit: add ambient capabilities to CAPSET and BPRM_FCAPS records)
Merging devicetree/for-next (08cd94ec522b dt-bindings: net: move FMan binding)
Merging mailbox/mailbox-for-next (cb710ab1d8a2 mailbox: handle empty message in tx_tick)
Merging spi/for-next (b8076f1a1d44 Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave', 'spi/topic/spidev' and 'spi/topic/st-ssc4' into spi-next)
Merging tip/auto-latest (894645be751b Merge branch 'x86/mm')
Merging clockevents/clockevents/next (d9569035d594 clocksource: Add an alias macro CLOCKSOURCE_OF_DECLARE)
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (cf97825862f0 EDAC, thunderx: Fix a warning during l2c debugfs node creation)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (6ee98ffeea0b x86/ftrace: Make sure that ftrace trampolines are not RWX)
Merging rcu/rcu/next (ce0407e1e883 rcutorture: Don't wait for kernel when all builds fail)
Merging kvm/linux-next (9d643f63128b KVM: x86: avoid large stack allocations in em_fxrstor)
Merging kvm-arm/next (a2b19e6e2d4b KVM: arm/arm64: vgic-its: Cleanup after failed ITT restore)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (76d837a4c0f9 KVM: PPC: Book3S PR: Don't include SPAPR TCE code on non-pseries platforms)
Merging kvms390/next (a2bdbb2c7e70 KVM: s390: ioctls to get and set guest storage attributes)
Merging xen-tip/linux-next (c71e6d804c88 xen: make xen_flush_tlb_all() static)
Merging percpu/for-next (1328710b8ec3 mark most percpu globals as __ro_after_init)
Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next)
Merging drivers-x86/for-next (6bee1af9dcaa platform/x86: intel_pmc_ipc: Mark ipc_data_readb() as __maybe_unused)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (3026050179a3 HSI: ssi_protocol: double free in ssip_pn_xmit())
Merging leds/for-next (834938e8788f leds: Remove SEAD-3 driver)
Merging ipmi/for-next (bf10ff69dd6e ipmi_ssif: remove redundant null check on array client->adapter->name)
Merging driver-core/driver-core-next (06a45a93e7d3 firmware: move umh try locks into the umh code)
Merging usb/usb-next (ef189c8dde9a usb: host: ohci-omap3: Remove driver in favor of ohci-platform)
Merging usb-gadget/next (2868b2513aa7 Merge tag 'linux-kselftest-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest)
Merging usb-serial/usb-next (4cd4475effd8 USB: serial: upd78f0730: make constants static)
Merging usb-chipidea-next/ci-for-usb-next (c4a0bbbdb7f6 usb: chipidea: properly handle host or gadget initialization failure)
Merging phy-next/next (4b797aa5d326 phy: rockchip-inno-usb2: add support of usb2-phy for rk3228 SoCs)
Merging tty/tty-next (094094a9373f serial: uartps: Fix kernel doc warnings)
Merging char-misc/char-misc-next (73726380a26f mux: mmio-based syscon mux controller)
Merging extcon/extcon-next (a781a7d646ad extcon: qcom-spmi-misc: add dependency on ARCH_QCOM)
Merging staging/staging-next (1d80d1bd176a staging: ccree: fix spelling mistake: "chanined" -> "chained")
CONFLICT (content): Merge conflict in include/uapi/linux/tty.h
Merging mux/for-next (a351e9b9fc24 Linux 4.11)
Merging slave-dma/next (cb636f8d7007 Merge branch 'fixes' into next)
Merging cgroup/for-next (41c25707d217 cpuset: consider dying css as offline)
Merging scsi/for-next (35f07119477d Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (41bc5b30fb4f scsi: qedf: Check if sense buffer has been allocated during completion)
Merging target-updates/for-next (982a458dbf13 iscsi-target: Kill left-over iscsi_target_do_cleanup)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging libata/for-next (e99d6d490ec8 Merge branch 'for-4.13' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (c8b0d7290657 s390/virtio: change maintainership)
Merging rpmsg/for-next (0696d197bda1 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (7043bc081bd1 Merge branch 'devel' into for-next)
Merging pinctrl/for-next (62edf480d86a Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging pinctrl-samsung/for-next (eb1c179c966a pinctrl: samsung: Explicitly cast pointer returned by of_iomap() to iomem)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (97512ceafaac Merge branch 'for-4.12/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (296990deb389 mnt: Make propagate_umount less slow for overlapping mount propagation trees)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (9dfa7bba35ac fix race in drivers/char/random.c:get_reg())
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (ea48ee387aef selftests/ftrace: Add a testcase for many kprobe events)
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (c87a040fb6c5 Merge branch 'for-4.12/upstream-fixes' into for-next)
Merging coresight/next (44389a7d12ec coresight: add support for CPU debug module)
Merging rtc/rtc-next (5c82a6ae0242 rtc: remove rtc_device.name)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (f5705aa8cfed dax, xfs, ext4: compile out iomap-dax paths in the FS_DAX=n case)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
Merging uuid/for-next (936070355d9f MAINTAINERS: add uuid entry)
Merging akpm-current/current (613e2f5f2d3a ipc/util.h: update documentation for ipc_getref() and ipc_putref())
Applying: Revert "include/linux/string.h: add the option of fortified string.h functions"
$ git checkout -b akpm remotes/origin/akpm/master
Applying: net/netfilter/x_tables.c: use kvmalloc() in xt_alloc_table_info()
Applying: sparc64: NG4 memset 32 bits overflow
Applying: xtensa: use generic fb.h
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
Merging akpm/master (6a8182eaab1d lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
^ permalink raw reply
* next-20170605 build: 0 failures 4 warnings (next-20170605)
From: Build bot for Mark Brown @ 2017-06-05 11:06 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170605
Git describe: next-20170605
Commit: f0090bfcf1 Add linux-next specific files for 20170605
Build Time: 119 min 40 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 4
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
11 warnings 0 mismatches : arm64-allmodconfig
10 warnings 0 mismatches : arm-multi_v7_defconfig
13 warnings 0 mismatches : arm-allmodconfig
10 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 4
40 ../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
2 ../drivers/i2c/i2c-stub.c:18:0: warning: "DEBUG" redefined
1 ../drivers/scsi/qla2xxx/qla_init.c:6709:7: warning: format '%lx' expects argument of type 'long unsigned int', but argument 5 has type 'unsigned int' [-Wformat=]
1 ../drivers/scsi/qla2xxx/qla_init.c:6407:7: warning: format '%lx' expects argument of type 'long unsigned int', but argument 5 has type 'unsigned int' [-Wformat=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 11 warnings, 0 section mismatches
Warnings:
../drivers/i2c/i2c-stub.c:18:0: warning: "DEBUG" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 10 warnings, 0 section mismatches
Warnings:
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 13 warnings, 0 section mismatches
Warnings:
../drivers/i2c/i2c-stub.c:18:0: warning: "DEBUG" redefined
../drivers/scsi/qla2xxx/qla_init.c:6407:7: warning: format '%lx' expects argument of type 'long unsigned int', but argument 5 has type 'unsigned int' [-Wformat=]
../drivers/scsi/qla2xxx/qla_init.c:6709:7: warning: format '%lx' expects argument of type 'long unsigned int', but argument 5 has type 'unsigned int' [-Wformat=]
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 10 warnings, 0 section mismatches
Warnings:
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
../drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm-current tree
From: Daniel Micay @ 2017-06-05 13:06 UTC (permalink / raw)
To: Stephen Rothwell, Andrew Morton
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Kees Cook
In-Reply-To: <20170605170117.6a1fc15e@canb.auug.org.au>
On Mon, 2017-06-05 at 17:01 +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> After merging the akpm-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> sound/pcmcia/pdaudiocf/pdaudiocf.o: warning: objtool: .text:
> unexpected end of section
> arch/x86/ras/mce_amd_inj.o: warning: objtool: inj_readme_read() falls
> through to next function extcpu_fops_open()
> sound/sound_core.o: warning: objtool: register_sound_special_device()
> falls through to next function register_sound_special()
>
> and many more like those.
It looks like that's complaining about the __noreturn fortify_panic. It
isn't a compile-time error, just a false positive warning which needs to
be fixed in objtool. I guess it needs another symbol added to a hard-
wired list of __noreturn functions which sounds like it exists.
> In file included from /home/sfr/next/next/include/linux/bitmap.h:8:0,
> from /home/sfr/next/next/include/linux/cpumask.h:11,
> from
> /home/sfr/next/next/arch/x86/include/asm/cpumask.h:4,
> from
> /home/sfr/next/next/arch/x86/include/asm/msr.h:10,
> from
> /home/sfr/next/next/arch/x86/include/asm/processor.h:20,
> from
> /home/sfr/next/next/arch/x86/include/asm/cpufeature.h:4,
> from
> /home/sfr/next/next/arch/x86/include/asm/thread_info.h:52,
> from
> /home/sfr/next/next/include/linux/thread_info.h:37,
> from
> /home/sfr/next/next/arch/x86/include/asm/preempt.h:6,
> from /home/sfr/next/next/include/linux/preempt.h:80,
> from /home/sfr/next/next/include/linux/spinlock.h:50,
> from /home/sfr/next/next/include/linux/mmzone.h:7,
> from /home/sfr/next/next/include/linux/gfp.h:5,
> from
> /home/sfr/next/next/arch/x86/power/hibernate_64.c:11:
> In function 'memcpy',
> inlined from 'relocate_restore_code' at
> /home/sfr/next/next/arch/x86/power/hibernate_64.c:150:2,
> inlined from 'swsusp_arch_resume' at
> /home/sfr/next/next/arch/x86/power/hibernate_64.c:185:8:
> /home/sfr/next/next/include/linux/string.h:309:4: error: call to
> '__read_overflow2' declared with attribute error: detected read beyond
> size of object passed as 2nd parameter
> __read_overflow2();
> ^
>
> Caused by commit
>
> 088a5ecf7581 ("include/linux/string.h: add the option of fortified
> string.h functions")
>
> We really need to fix all the known problems it detects *before*
> merging this commit ...
>
> I have reverted it for today.
The errors caught at compile-time including these are all fixed, but not
all the fixes have landed in -next yet. They're in various other trees.
GCC 7 came out which found an extra bug or two which are now fixed too.
I guess those need to be queued up with it in -mm if it's going to land
with -mm but I wasn't sure how things were going to work.
It also probably finds more architecture-specific issues and may need
compatibility fixes for them. I could mark it as compatible with only
arm64 and x86(_64) since they're what I've tested to build and work at
runtime and the compile-time errors could be turned into warnings for
now, if it's mandatory that FORTIFY_SOURCE=y doesn't find problems at
compile-time anywhere. If it's a warning, it will still catch the issue
at runtime like the rest where the size isn't a constant.
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm-current tree
From: Daniel Micay @ 2017-06-05 13:34 UTC (permalink / raw)
To: Stephen Rothwell, Andrew Morton
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Kees Cook
In-Reply-To: <1496667976.343.3.camel@gmail.com>
> It also probably finds more architecture-specific issues and may need
> compatibility fixes for them. I could mark it as compatible with only
> arm64 and x86(_64) since they're what I've tested to build and work at
> runtime and the compile-time errors could be turned into warnings for
> now, if it's mandatory that FORTIFY_SOURCE=y doesn't find problems at
> compile-time anywhere. If it's a warning, it will still catch the
> issue
> at runtime like the rest where the size isn't a constant.
I'm already leaving out intra-object overflow checks and the alloc_size
attributes in this initial submission to make it easier to land so
scaling it back a bit more (errors -> warnings, gating on archs) isn't a
problem if it's needed to get started.
^ permalink raw reply
* linux-next: strange update of the sound tree
From: Stephen Rothwell @ 2017-06-05 14:17 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
Hi Takashi,
I don't think you have the result in the sound tree
(git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
branch for-next). Yesterday it was a fairly linear tree with head
commit 7421a1671abe ("ALSA: pcm: include pcm_local.h and remove some
extraneous tabs") based on commit f83914fdfcc3 ("ALSA: usb-audio: fix
Amanero Combo384 quirk on big-endian hosts"). Now it is a tree with
687 commits (realative to Linus' tree) with 651 merge commits in it. :-(
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build warnings after merge of the uuid tree
From: Andy Shevchenko @ 2017-06-05 14:40 UTC (permalink / raw)
To: Stephen Rothwell, Christoph Hellwig
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
In-Reply-To: <20170605160928.2930133d@canb.auug.org.au>
On Mon, 2017-06-05 at 16:09 +1000, Stephen Rothwell wrote:
> Hi Christoph,
>
> After merging the uuid tree, today's linux-next build (arm
> multi_v7_defconfig and x86_64 allmodconfig) produced these warnings:
>
Briefly looking to the conflict it looks like we first need to rename
register description(s) in dwc2 in the way how it's done in dwc3.
diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
index 1b6612c2cdda..82f92443f26f 100644
--- a/drivers/usb/dwc2/core.c
+++ b/drivers/usb/dwc2/core.c
@@ -636,7 +636,7 @@ void dwc2_dump_global_registers(struct dwc2_hsotg
*hsotg)
addr = hsotg->regs + GGPIO;
dev_dbg(hsotg->dev, "GGPIO @0x%08lX : 0x%08X\n",
(unsigned long)addr, dwc2_readl(addr));
- addr = hsotg->regs + GUID;
+ addr = hsotg->regs + DWC2_GUID;
dev_dbg(hsotg->dev, "GUID @0x%08lX : 0x%08X\n",
(unsigned long)addr, dwc2_readl(addr));
addr = hsotg->regs + GSNPSID;
diff --git a/drivers/usb/dwc2/debugfs.c b/drivers/usb/dwc2/debugfs.c
index 794b959a7c8c..c51ee70904e6 100644
--- a/drivers/usb/dwc2/debugfs.c
+++ b/drivers/usb/dwc2/debugfs.c
@@ -419,7 +419,7 @@ static const struct debugfs_reg32 dwc2_regs[] = {
dump_register(GI2CCTL),
dump_register(GPVNDCTL),
dump_register(GGPIO),
- dump_register(GUID),
+ dump_register(DWC2_GUID),
dump_register(GSNPSID),
dump_register(GHWCFG1),
dump_register(GHWCFG2),
diff --git a/drivers/usb/dwc2/hw.h b/drivers/usb/dwc2/hw.h
index 4592012c4743..ccfb6a55616b 100644
--- a/drivers/usb/dwc2/hw.h
+++ b/drivers/usb/dwc2/hw.h
@@ -227,7 +227,7 @@
#define GGPIO HSOTG_REG(0x0038)
#define GGPIO_STM32_OTG_GCCFG_PWRDWN BIT(16)
-#define GUID HSOTG_REG(0x003c)
+#define DWC2_GUID HSOTG_REG(0x003c)
#define GSNPSID HSOTG_REG(0x0040)
#define GHWCFG1 HSOTG_REG(0x0044)
> In file included from drivers/usb/dwc2/core.h:45:0,
> from drivers/usb/dwc2/core_intr.c:53:
> drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
> #define GUID HSOTG_REG(0x003c)
> ^
> In file included from include/linux/uuid.h:19:0,
> from include/linux/fs.h:33,
> from include/linux/seq_file.h:10,
> from include/linux/pinctrl/consumer.h:17,
> from include/linux/pinctrl/devinfo.h:21,
> from include/linux/device.h:24,
> from include/linux/dma-mapping.h:6,
> from drivers/usb/dwc2/core_intr.c:45:
> include/uapi/linux/uuid.h:27:0: note: this is the location of the
> previous definition
> #define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
> ^
> In file included from drivers/usb/dwc2/core.h:45:0,
> from drivers/usb/dwc2/core.c:56:
> drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
> #define GUID HSOTG_REG(0x003c)
> ^
> In file included from include/linux/uuid.h:19:0,
> from include/linux/fs.h:33,
> from include/linux/seq_file.h:10,
> from include/linux/pinctrl/consumer.h:17,
> from include/linux/pinctrl/devinfo.h:21,
> from include/linux/device.h:24,
> from include/linux/dma-mapping.h:6,
> from drivers/usb/dwc2/core.c:47:
> include/uapi/linux/uuid.h:27:0: note: this is the location of the
> previous definition
> #define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
> ^
> In file included from drivers/usb/dwc2/core.h:45:0,
> from drivers/usb/dwc2/platform.c:52:
> drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
> #define GUID HSOTG_REG(0x003c)
> ^
> In file included from include/linux/uuid.h:19:0,
> from include/linux/fs.h:33,
> from include/linux/seq_file.h:10,
> from include/linux/pinctrl/consumer.h:17,
> from include/linux/pinctrl/devinfo.h:21,
> from include/linux/device.h:24,
> from drivers/usb/dwc2/platform.c:41:
> include/uapi/linux/uuid.h:27:0: note: this is the location of the
> previous definition
> #define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
> ^
> In file included from drivers/usb/dwc2/core.h:45:0,
> from drivers/usb/dwc2/params.c:39:
> drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
> #define GUID HSOTG_REG(0x003c)
> ^
> In file included from include/linux/uuid.h:19:0,
> from include/linux/fs.h:33,
> from include/linux/seq_file.h:10,
> from include/linux/pinctrl/consumer.h:17,
> from include/linux/pinctrl/devinfo.h:21,
> from include/linux/device.h:24,
> from include/linux/node.h:17,
> from include/linux/cpu.h:16,
> from include/linux/of_device.h:4,
> from drivers/usb/dwc2/params.c:37:
> include/uapi/linux/uuid.h:27:0: note: this is the location of the
> previous definition
> #define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
> ^
> In file included from drivers/usb/dwc2/core.h:45:0,
> from drivers/usb/dwc2/hcd.c:55:
> drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
> #define GUID HSOTG_REG(0x003c)
> ^
> In file included from include/linux/uuid.h:19:0,
> from include/linux/fs.h:33,
> from include/linux/seq_file.h:10,
> from include/linux/pinctrl/consumer.h:17,
> from include/linux/pinctrl/devinfo.h:21,
> from include/linux/device.h:24,
> from include/linux/platform_device.h:14,
> from drivers/usb/dwc2/hcd.c:45:
> include/uapi/linux/uuid.h:27:0: note: this is the location of the
> previous definition
> #define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
> ^
> In file included from drivers/usb/dwc2/core.h:45:0,
> from drivers/usb/dwc2/hcd_intr.c:52:
> drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
> #define GUID HSOTG_REG(0x003c)
> ^
> In file included from include/linux/uuid.h:19:0,
> from include/linux/fs.h:33,
> from include/linux/seq_file.h:10,
> from include/linux/pinctrl/consumer.h:17,
> from include/linux/pinctrl/devinfo.h:21,
> from include/linux/device.h:24,
> from include/linux/dma-mapping.h:6,
> from drivers/usb/dwc2/hcd_intr.c:44:
> include/uapi/linux/uuid.h:27:0: note: this is the location of the
> previous definition
> #define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
> ^
> In file included from drivers/usb/dwc2/core.h:45:0,
> from drivers/usb/dwc2/hcd_queue.c:54:
> drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
> #define GUID HSOTG_REG(0x003c)
> ^
> In file included from include/linux/uuid.h:19:0,
> from include/linux/fs.h:33,
> from include/linux/seq_file.h:10,
> from include/linux/pinctrl/consumer.h:17,
> from include/linux/pinctrl/devinfo.h:21,
> from include/linux/device.h:24,
> from include/linux/dma-mapping.h:6,
> from drivers/usb/dwc2/hcd_queue.c:46:
> include/uapi/linux/uuid.h:27:0: note: this is the location of the
> previous definition
> #define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
> ^
> In file included from drivers/usb/dwc2/core.h:45:0,
> from drivers/usb/dwc2/hcd_ddma.c:52:
> drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
> #define GUID HSOTG_REG(0x003c)
> ^
> In file included from include/linux/uuid.h:19:0,
> from include/linux/fs.h:33,
> from include/linux/seq_file.h:10,
> from include/linux/pinctrl/consumer.h:17,
> from include/linux/pinctrl/devinfo.h:21,
> from include/linux/device.h:24,
> from include/linux/dma-mapping.h:6,
> from drivers/usb/dwc2/hcd_ddma.c:44:
> include/uapi/linux/uuid.h:27:0: note: this is the location of the
> previous definition
> #define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
> ^
> In file included from drivers/usb/dwc2/core.h:45:0,
> from drivers/usb/dwc2/debugfs.c:22:
> drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
> #define GUID HSOTG_REG(0x003c)
> ^
> In file included from include/linux/uuid.h:19:0,
> from include/linux/fs.h:33,
> from include/linux/debugfs.h:18,
> from drivers/usb/dwc2/debugfs.c:18:
> include/uapi/linux/uuid.h:27:0: note: this is the location of the
> previous definition
> #define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
> ^
> In file included from drivers/usb/dwc2/core.h:45:0,
> from drivers/usb/dwc2/gadget.c:34:
> drivers/usb/dwc2/hw.h:230:0: warning: "GUID" redefined
> #define GUID HSOTG_REG(0x003c)
> ^
> In file included from include/linux/uuid.h:19:0,
> from include/linux/fs.h:33,
> from include/linux/seq_file.h:10,
> from include/linux/pinctrl/consumer.h:17,
> from include/linux/pinctrl/devinfo.h:21,
> from include/linux/device.h:24,
> from include/linux/platform_device.h:14,
> from drivers/usb/dwc2/gadget.c:21:
> include/uapi/linux/uuid.h:27:0: note: this is the location of the
> previous definition
> #define GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
> ^
>
> Introduced by commit
>
> e0a74cd0a2d4 ("uuid: rename uuid types")
>
> GUID is used in at least 2 other files as well :-(
>
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply related
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