* GREETINGS
From: Pedro Quezada @ 2016-03-03 17:23 UTC (permalink / raw)
Wife and I Pedro Quezada won 338 Million USD in a Powerball lottery 6-49
in March, 2013 and I have decided to donate the sum of 2M USD to you.
Contact me via my personal email for more details (qpedro431@gmail.com)
You can verify our story by visiting the web page below.
http://www.dailymail.co.uk/news/article-2299067/Powerball-winner-Pedro-Quezada-shocked-ticket-worth-338million.html
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
^ permalink raw reply
* Re: linux-next: unsigned commits in tpmdd tree
From: Stephen Rothwell @ 2016-03-03 22:48 UTC (permalink / raw)
To: Jarkko Sakkinen; +Cc: linux-next, linux-kernel
In-Reply-To: <20160303101413.GA6003@intel.com>
Hi Jarkko,
On Thu, 3 Mar 2016 12:14:13 +0200 Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> wrote:
>
> They are now rebased.
Thanks.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: ext2/3 using ext4 module mkdir IO error on pmem DAX mount
From: Theodore Ts'o @ 2016-03-03 23:49 UTC (permalink / raw)
To: lokesh jaliminche
Cc: Ross Zwisler, Xiong Zhou, Andreas Dilger, linux-nvdimm,
linux-ext4, linux-next, linux-kernel
In-Reply-To: <CAKJOkCoLEs2cQuS+CeciUY39ErQeOYmkQ_Jj4gHePPTUTMngrA@mail.gmail.com>
On Thu, Mar 03, 2016 at 10:49:51PM +0530, lokesh jaliminche wrote:
> Hi,
> I have tested it locally I am also getting same error but not
> consistently. I have put some debug logs for debugging, as per the logs
> it seems that block_group is not getting initialized properly. I am
> not sure weather this is because of my patch. Need to debug more.
I'm quite sure it's your patch, so I'm going to drop it for now. Note
that with ext3, we don't have flex_bg's (the flex_bg size is 1).
Here's a reliable repro:
kvm-xfstests --no-log -c ext3 generic/003
For more about kvm-xfstests
https://git.kernel.org/cgit/fs/ext2/xfstests-bld.git/tree/quick-start?h=META
Output from running this test:
BEGIN TEST ext3: Ext4 4k block emulating ext3 Thu Mar 3 18:39:33 EST 2016
DEVICE: /dev/vdd
MK2FS OPTIONS: -q -O ^extents,^flex_bg,^uninit_bg,^64bit,^metadata_csum,^huge_file,^dir_nlink,^extra_isize
MOUNT OPTIONS: -o block_validity,nodelalloc
FSTYP -- ext4
PLATFORM -- Linux/i686 kvm-xfstests 4.5.0-rc2-00026-g1f2d779
MKFS_OPTIONS -- -q -O ^extents,^flex_bg,^uninit_bg,^64bit,^metadata_csum,^huge_file,^dir_nlink,^extra_isize /dev/vdc
MOUNT_OPTIONS -- -o acl,user_xattr -o block_validity,nodelalloc /dev/vdc /vdc
generic/003 [18:39:35][ 13.096353] run fstests generic/003 at 2016-03-03 18:39:35
[ 14.859764] EXT4-fs error (device vdc): ext4_get_group_desc:288: comm mkdir: block_group >= groups_count - block_group = 850480444, groups_count = 40
[ 16.944808] EXT4-fs (vdc): warning: mounting fs with errors, running e2fsck is recommended
[ 16.956276] EXT4-fs error (device vdc): ext4_get_group_desc:288: comm mkdir: block_group >= groups_count - block_group = 3221700656, groups_count = 40
[ 19.023011] EXT4-fs (vdc): warning: mounting fs with errors, running e2fsck is recommended
[ 22.104702] EXT4-fs (vdc): warning: mounting fs with errors, running e2fsck is recommended
[18:39:46] - output mismatch (see /results/results-ext3/generic/003.out.bad)
--- tests/generic/003.out 2016-02-29 22:18:21.000000000 -0500
+++ /results/results-ext3/generic/003.out.bad 2016-03-03 18:39:46.587676694 -0500
@@ -1,2 +1,46 @@
QA output created by 003
+mkdir: cannot create directory '/vdc/dir1': Input/output error
+./tests/generic/003: line 93: /vdc/dir1/file1: No such file or directory
+stat: cannot stat '/vdc/dir1/file1': No such file or directory
+cat: /vdc/dir1/file1: No such file or directory
+stat: cannot stat '/vdc/dir1/file1': No such file or directory
+ERROR: access time has not been updated after accessing file1 first time
...
(Run 'diff -u tests/generic/003.out /results/results-ext3/generic/003.out.bad' to see the entire diff)
Ran: generic/003
Failures: generic/003
Failed 1 of 1 tests
(In fact a huge number of tests fail using the ext3 configuration, but
generic/003 is a quick fast test. Before submitting patches, please
run at the very least "kvm-xfstests smoke". Admittedly, for this bug
the smoke test wouldn't have been enough. You would have needed
"kvm-xfstests-g quick", or preferably, "kvm-xfstests -g auto".
Alternatively, you can use gce-xfstests, which uses Google Compute
Engine where you can just fire off the tests, and it will send you
e-mail with the test results. See
https://git.kernel.org/cgit/fs/ext2/xfstests-bld.git/tree/kvm-xfstests/README.GCE
for more information.)
- Ted
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-03-04 2:09 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Daniel Borkmann, Jiri Benc
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/vxlan.c
between commit:
4024fcf70556 ("vxlan: fix missing options_len update on RX with collect metadata")
from the net tree and commit:
3288af0892e3 ("vxlan: move GBP header parsing to a separate function")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/vxlan.c
index 1c32bd104797,775ddb48388d..000000000000
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@@ -1129,49 -1144,61 +1146,63 @@@ static bool vxlan_remcsum(struct vxlanh
{
size_t start, offset, plen;
- if (skb->remcsum_offload)
- return vh;
+ if (!(unparsed->vx_flags & VXLAN_HF_RCO) || skb->remcsum_offload)
+ goto out;
- start = (data & VXLAN_RCO_MASK) << VXLAN_RCO_SHIFT;
- offset = start + ((data & VXLAN_RCO_UDP) ?
- offsetof(struct udphdr, check) :
- offsetof(struct tcphdr, check));
+ start = vxlan_rco_start(unparsed->vx_vni);
+ offset = start + vxlan_rco_offset(unparsed->vx_vni);
- plen = hdrlen + offset + sizeof(u16);
+ plen = sizeof(struct vxlanhdr) + offset + sizeof(u16);
if (!pskb_may_pull(skb, plen))
- return NULL;
+ return false;
+
+ skb_remcsum_process(skb, (void *)(vxlan_hdr(skb) + 1), start, offset,
+ !!(vxflags & VXLAN_F_REMCSUM_NOPARTIAL));
+ out:
+ unparsed->vx_flags &= ~VXLAN_HF_RCO;
+ unparsed->vx_vni &= VXLAN_VNI_MASK;
+ return true;
+ }
+
+ static void vxlan_parse_gbp_hdr(struct vxlanhdr *unparsed,
+ struct sk_buff *skb, u32 vxflags,
+ struct vxlan_metadata *md)
+ {
+ struct vxlanhdr_gbp *gbp = (struct vxlanhdr_gbp *)unparsed;
+ struct metadata_dst *tun_dst;
- vh = (struct vxlanhdr *)(udp_hdr(skb) + 1);
+ if (!(unparsed->vx_flags & VXLAN_HF_GBP))
+ goto out;
- skb_remcsum_process(skb, (void *)vh + hdrlen, start, offset,
- nopartial);
+ md->gbp = ntohs(gbp->policy_id);
- return vh;
+ tun_dst = (struct metadata_dst *)skb_dst(skb);
- if (tun_dst)
++ if (tun_dst) {
+ tun_dst->u.tun_info.key.tun_flags |= TUNNEL_VXLAN_OPT;
++ tun_dst->u.tun_info.options_len = sizeof(*md);
++ }
+
+ if (gbp->dont_learn)
+ md->gbp |= VXLAN_GBP_DONT_LEARN;
+
+ if (gbp->policy_applied)
+ md->gbp |= VXLAN_GBP_POLICY_APPLIED;
+
+ /* In flow-based mode, GBP is carried in dst_metadata */
+ if (!(vxflags & VXLAN_F_COLLECT_METADATA))
+ skb->mark = md->gbp;
+ out:
+ unparsed->vx_flags &= ~VXLAN_GBP_USED_BITS;
}
- static void vxlan_rcv(struct vxlan_sock *vs, struct sk_buff *skb,
- struct vxlan_metadata *md, u32 vni,
- struct metadata_dst *tun_dst)
+ static bool vxlan_set_mac(struct vxlan_dev *vxlan,
+ struct vxlan_sock *vs,
+ struct sk_buff *skb)
{
- struct iphdr *oip = NULL;
- struct ipv6hdr *oip6 = NULL;
- struct vxlan_dev *vxlan;
- struct pcpu_sw_netstats *stats;
union vxlan_addr saddr;
- int err = 0;
-
- /* For flow based devices, map all packets to VNI 0 */
- if (vs->flags & VXLAN_F_COLLECT_METADATA)
- vni = 0;
-
- /* Is this VNI defined? */
- vxlan = vxlan_vs_find_vni(vs, vni);
- if (!vxlan)
- goto drop;
skb_reset_mac_header(skb);
- skb_scrub_packet(skb, !net_eq(vxlan->net, dev_net(vxlan->dev)));
skb->protocol = eth_type_trans(skb, vxlan->dev);
skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: Daniel Borkmann @ 2016-03-04 2:17 UTC (permalink / raw)
To: Stephen Rothwell, David Miller, netdev
Cc: linux-next, linux-kernel, Jiri Benc
In-Reply-To: <20160304130949.47a94ac8@canb.auug.org.au>
On 03/04/2016 03:09 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/vxlan.c
>
> between commit:
>
> 4024fcf70556 ("vxlan: fix missing options_len update on RX with collect metadata")
>
> from the net tree and commit:
>
> 3288af0892e3 ("vxlan: move GBP header parsing to a separate function")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks!
^ permalink raw reply
* linux-next: build failure after merge of the device-mapper tree
From: Stephen Rothwell @ 2016-03-04 2:59 UTC (permalink / raw)
To: Alasdair G Kergon, Mike Snitzer; +Cc: linux-next, linux-kernel
Hi all,
After merging the device-mapper tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/md/dm.c: In function '__split_and_process_non_flush':
drivers/md/dm.c:1761:6: error: 'ret' undeclared (first use in this function)
if (ret < 0)
^
Caused by commit
f838997d1784 ("dm: return error if bio_integrity_clone() fails in clone_bio()")
That one is a bit annoying ... clearly not build tested :-(
I have used the device-mapper tree from next-20160303 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the device-mapper tree
From: Mike Snitzer @ 2016-03-04 3:14 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Alasdair G Kergon, linux-next, linux-kernel
In-Reply-To: <20160304135933.0ba93056@canb.auug.org.au>
On Thu, Mar 03 2016 at 9:59pm -0500,
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the device-mapper tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/md/dm.c: In function '__split_and_process_non_flush':
> drivers/md/dm.c:1761:6: error: 'ret' undeclared (first use in this function)
> if (ret < 0)
> ^
>
> Caused by commit
>
> f838997d1784 ("dm: return error if bio_integrity_clone() fails in clone_bio()")
>
> That one is a bit annoying ... clearly not build tested :-(
Yeap, I'll just let that go.
> I have used the device-mapper tree from next-20160303 for today.
Not sure what happened. I've fixed it. next-20160303 is fine though
since the bad commit was pushed today.
^ permalink raw reply
* linux-next: manual merge of the rcu tree with the tip tree
From: Stephen Rothwell @ 2016-03-04 4:13 UTC (permalink / raw)
To: Paul E. McKenney, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
Cc: linux-next, linux-kernel, Boqun Feng
Hi Paul,
Today's linux-next merge of the rcu tree got a conflict in:
kernel/rcu/tree.c
between commit:
27d50c7eeb0f ("rcu: Make CPU_DYING_IDLE an explicit call")
from the tip tree and commit:
67c583a7de34 ("RCU: Privatize rcu_node::lock")
from the rcu tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc kernel/rcu/tree.c
index 0bbc1497a0e4,55cea189783f..000000000000
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@@ -4227,43 -4246,6 +4224,43 @@@ static void rcu_prepare_cpu(int cpu
rcu_init_percpu_data(cpu, rsp);
}
+#ifdef CONFIG_HOTPLUG_CPU
+/*
+ * The CPU is exiting the idle loop into the arch_cpu_idle_dead()
+ * function. We now remove it from the rcu_node tree's ->qsmaskinit
+ * bit masks.
+ */
+static void rcu_cleanup_dying_idle_cpu(int cpu, struct rcu_state *rsp)
+{
+ unsigned long flags;
+ unsigned long mask;
+ struct rcu_data *rdp = per_cpu_ptr(rsp->rda, cpu);
+ struct rcu_node *rnp = rdp->mynode; /* Outgoing CPU's rdp & rnp. */
+
+ if (!IS_ENABLED(CONFIG_HOTPLUG_CPU))
+ return;
+
+ /* Remove outgoing CPU from mask in the leaf rcu_node structure. */
+ mask = rdp->grpmask;
+ raw_spin_lock_irqsave_rcu_node(rnp, flags); /* Enforce GP memory-order guarantee. */
+ rnp->qsmaskinitnext &= ~mask;
- raw_spin_unlock_irqrestore(&rnp->lock, flags);
++ raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
+}
+
+void rcu_report_dead(unsigned int cpu)
+{
+ struct rcu_state *rsp;
+
+ /* QS for any half-done expedited RCU-sched GP. */
+ preempt_disable();
+ rcu_report_exp_rdp(&rcu_sched_state,
+ this_cpu_ptr(rcu_sched_state.rda), true);
+ preempt_enable();
+ for_each_rcu_flavor(rsp)
+ rcu_cleanup_dying_idle_cpu(cpu, rsp);
+}
+#endif
+
/*
* Handle CPU online/offline notification events.
*/
^ permalink raw reply
* linux-next: manual merge of the kvm tree with the powerpc tree
From: Stephen Rothwell @ 2016-03-04 4:30 UTC (permalink / raw)
To: Marcelo Tosatti, Gleb Natapov, kvm, Michael Ellerman,
Benjamin Herrenschmidt, linuxppc-dev
Cc: linux-next, linux-kernel, Aneesh Kumar K.V, Alexey Kardashevskiy,
Paul Mackerras
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/kvm/book3s_64_vio_hv.c
between commit:
f64e8084c94b ("powerpc/mm: Move hash related mmu-*.h headers to book3s/")
from the powerpc tree and commit:
d3695aa4f452 ("KVM: PPC: Add support for multiple-TCE hcalls")
from the kvm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc arch/powerpc/kvm/book3s_64_vio_hv.c
index 039028d3ccb5,44be73e6aa26..000000000000
--- a/arch/powerpc/kvm/book3s_64_vio_hv.c
+++ b/arch/powerpc/kvm/book3s_64_vio_hv.c
@@@ -29,7 -30,8 +30,8 @@@
#include <asm/tlbflush.h>
#include <asm/kvm_ppc.h>
#include <asm/kvm_book3s.h>
-#include <asm/mmu-hash64.h>
+#include <asm/book3s/64/mmu-hash.h>
+ #include <asm/mmu_context.h>
#include <asm/hvcall.h>
#include <asm/synch.h>
#include <asm/ppc-opcode.h>
^ permalink raw reply
* linux-next: manual merge of the staging tree with the v4l-dvb tree
From: Stephen Rothwell @ 2016-03-04 5:24 UTC (permalink / raw)
To: Greg KH, Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, Janani Ravichandran, Antti Palosaari
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/media/dvb-frontends/mn88473.c
between commit:
7908fad99a6c ("[media] mn88473: finalize driver")
from the v4l-dvb tree and commit:
3a35be2a1443 ("staging: media: Remove unneeded parentheses")
from the staging tree.
I fixed it up (I just used the v4l-dvb tree version) and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the akpm-current tree with the powerpc tree
From: Stephen Rothwell @ 2016-03-04 7:49 UTC (permalink / raw)
To: Andrew Morton, Michael Ellerman, Benjamin Herrenschmidt,
linuxppc-dev
Cc: linux-next, linux-kernel, Kirill A. Shutemov, Ebru Akagunduz
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/huge_memory.c
between commit:
ff20c2e0acc5 ("mm: Some arch may want to use HPAGE_PMD related values as variables")
from the powerpc tree and commit:
82fdbe051e29 ("mm: make optimistic check for swapin readahead")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc mm/huge_memory.c
index 43b11a695113,5b38aa24566f..000000000000
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@@ -98,7 -100,8 +100,8 @@@ static DECLARE_WAIT_QUEUE_HEAD(khugepag
* it would have happened if the vma was large enough during page
* fault.
*/
-static unsigned int khugepaged_max_ptes_none __read_mostly = HPAGE_PMD_NR-1;
-static unsigned int khugepaged_max_ptes_swap __read_mostly = HPAGE_PMD_NR/8;
+static unsigned int khugepaged_max_ptes_none __read_mostly;
++static unsigned int khugepaged_max_ptes_swap __read_mostly;
static int khugepaged(void *none);
static int khugepaged_slab_init(void);
@@@ -660,18 -691,6 +691,19 @@@ static int __init hugepage_init(void
return -EINVAL;
}
+ khugepaged_pages_to_scan = HPAGE_PMD_NR * 8;
+ khugepaged_max_ptes_none = HPAGE_PMD_NR - 1;
++ khugepaged_max_ptes_swap = HPAGE_PMD_NR / 8;
+ /*
+ * hugepages can't be allocated by the buddy allocator
+ */
+ MAYBE_BUILD_BUG_ON(HPAGE_PMD_ORDER >= MAX_ORDER);
+ /*
+ * we use page->mapping and page->index in second tail page
+ * as list_head: assuming THP order >= 2
+ */
+ MAYBE_BUILD_BUG_ON(HPAGE_PMD_ORDER < 2);
+
err = hugepage_init_sysfs(&hugepage_kobj);
if (err)
goto err_sysfs;
^ permalink raw reply
* linux-next: Tree for Mar 4
From: Stephen Rothwell @ 2016-03-04 8:17 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160303:
The net-next tree gained a conflict against the net tree.
The device-mapper tree gained a build failure so I used the version
from next-20160303.
The tip tree lost its build failure.
The rcu tree gained a conflict against the tip tree.
The kvm tree gained a conflict against the powerpc tree.
The staging tree gained a conflict against the v4l-dvb tree.
The aio tree still had a build failure so I used the version from
next-20160111.
The akpm-current tree gained a conflict against the powerpc tree.
Non-merge commits (relative to Linus' tree): 9198
7250 files changed, 348387 insertions(+), 167339 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 241 trees (counting Linus' and 36 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (e3c2ef41f88e Merge tag 'pci-v4.5-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (fc77dbd34c5c Linux 4.5-rc6)
Merging arm-current/fixes (c7edd7f99cda ARM: 8534/1: virt: fix hyp-stub build for pre-ARMv7 CPUs)
Merging m68k-current/for-linus (daf670bc9d36 m68k/defconfig: Update defconfigs for v4.5-rc1)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (fb822e6076d9 powerpc/hw_breakpoint: Fix oops when destroying hw_breakpoint event)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (f983cd32cd5d Merge branch 'parisc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging net/master (c1bb0a558881 be2net: don't enable multicast flag in be_enable_if_filters() routine)
Merging ipsec/master (3ed01df4ff79 xfrm: Reset encapsulation field of the skb before transformation)
Merging ipvs/master (5acaf89f88b9 netfilter: ipvs: handle ip_vs_fill_iph_skb_off failure)
Merging wireless-drivers/master (10da848f67a7 ssb: host_soc depends on sprom)
Merging mac80211/master (2af8c4dc2e9c mac80211_hwsim: treat as part of mac80211 for MAINTAINERS)
Merging sound-current/for-linus (02322ac9dee9 ALSA: hda - Fix mic issues on Acer Aspire E1-472)
Merging pci-current/for-linus (1195c103f6c9 PCI: layerscape: Fix MSG TLP drop setting)
Merging driver-core.current/driver-core-linus (18558cae0272 Linux 4.5-rc4)
Merging tty.current/tty-linus (18558cae0272 Linux 4.5-rc4)
Merging usb.current/usb-linus (861c3849222b Merge tag 'usb-serial-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-gadget-fixes/fixes (3b2435192fe9 MAINTAINERS: drop OMAP USB and MUSB maintainership)
Merging usb-serial-fixes/usb-linus (04fdbc825ffc USB: qcserial: add Sierra Wireless EM74xx device ID)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (fc77dbd34c5c Linux 4.5-rc6)
Merging char-misc.current/char-misc-linus (fc77dbd34c5c Linux 4.5-rc6)
Merging input-current/for-linus (ff84dabe3c6e Input: colibri-vf50-ts - add missing #include <linux/of.h>)
Merging crypto-current/master (8a3978ad55fb crypto: marvell/cesa - fix test in mv_cesa_dev_dma_init())
Merging ide/master (e04a2bd6d8c9 drivers/ide: make ide-scan-pci.c driver explicitly non-modular)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (92e963f50fc7 Linux 4.5-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (eda908967fee drm/i915: Balance assert_rpm_wakelock_held() for !IS_ENABLED(CONFIG_PM))
Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files)
Merging arc/for-next (463a42848bee ARC: clockevent: Prepare for DT based probe)
Merging arm/for-next (113b44c6c25b Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next)
Merging arm-perf/for-next/perf (fe638401a091 arm64: perf: Extend ARMV8_EVTYPE_MASK to include PMCR.LC)
Merging arm-soc/for-next (2379bf18edfb arm-soc: document merges)
Merging at91/at91-next (c40abde4b32e Merge branch 'at91-4.6-dt' into at91-next)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging bcm2835-dt/bcm2835-dt-next (1305141d1a72 ARM: bcm2835: add bcm2835-aux-uart support to DT)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (0a05d3b71ada ARM: multi_v7_defconfig: Enable BCM283x)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (9e26d5f485d7 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile
Merging mvebu/for-next (5be603bdf1a7 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (aec24f100558 Merge branch 'omap-for-v4.6/fixes-not-urgent' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/logicpd-torpedo-som.dtsi
Merging omap-pending/for-next (8fe097a3d99e ARM: DRA7: hwmod: Add reset data for PCIe)
Merging qcom/for-next (f17d0d578214 ARM: dts: msm8974: Add SCM firmware node)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging renesas/next (f094c5346231 Merge branch 'heads/sh-drivers-for-v4.6' into next)
Merging rockchip/for-next (545d1b355f3a Merge branch 'v4.6-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (61b99f519944 Merge branch 'next/defconfig' into for-next)
CONFLICT (content): Merge conflict in drivers/clk/Kconfig
Merging sunxi/sunxi/for-next (73e5379b0442 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/config64-for-4.6' and 'sunxi/dt-for-4.6' into sunxi/for-next)
Merging tegra/for-next (6bc0046e0a7b Merge branch for-4.6/arm64 into for-next)
Merging arm64/for-next/core (57efac2f7108 arm64: enable CONFIG_DEBUG_RODATA by default)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cputype.h
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (11943fdd17d2 h8300: dts: Rename the serial port clock to fck)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (a9c9d9aca4e7 zorro: Use kobj_to_dev())
Merging m68knommu/for-next (0cdfea013ee8 m68knommu: fix FEC platform device registration when driver is modular)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls)
Merging mips/mips-for-linux-next (b355c39c1fc9 Merge branch '4.5-fixes' into mips-for-linux-next)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
Merging powerpc/next (ee3b93ebfbed powerpc/mm: Move hash64 tlbflush code into a new header)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (f369b98ee30d s390/percpu: remove this_cpu_cmpxchg_double_4)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f1c3418ed4e6 tile kgdb: fix bug in copy to gdb regs, and optimize memset)
Merging uml/linux-next (288b31a382d2 um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (bb2f3486041a Merge tag 'xtensa-for-next-20160111' of git://github.com/jcmvbkbc/linux-xtensa)
Merging btrfs/next (5e33a2bd7ca7 Btrfs: do not collect ordered extents when logging that inode exists)
Merging btrfs-kdave/for-next (a3116483930c Merge branch 'for-next-4.6-20160229' into for-next-20160229)
Merging ceph/master (cd8140c673d9 libceph: don't spam dmesg with stray reply warnings)
Merging cifs/for-next (f983cd32cd5d Merge branch 'parisc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging configfs/for-next (b1f1a29d8fb5 configfs: Replace CURRENT_TIME by current_fs_time())
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (ab73ef46398e quota: Fix possible GPF due to uninitialised pointers)
Merging ext4/dev (d89b5f6318c2 jbd2: save some atomic ops in __JI_COMMIT_RUNNING handling)
Merging f2fs/dev (836b158ba9f2 f2fs crypto: sync ext4_lookup and ext4_file_open)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek)
Merging gfs2/for-next (a63be4e6d0e9 GFS2: Eliminate parameter non_block on gfs2_inode_lookup)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (ecf782868399 Merge branch 'multipath')
Merging nfsd/nfsd-next (be99bb11400c svcrdma: Use new CQ API for RPC-over-RDMA server send CQs)
Merging orangefs/for-next (9d9e7ba9ee8f Orangefs: improve gossip statements)
Applying: orangfs: update for follow_link to get_link change
Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4fdd1d51ad5d ubifs: Use XATTR_*_PREFIX_LEN)
Merging xfs/for-next (31bb2360d45a Merge branch 'xfs-misc-fixes-4.6-2' into for-next)
CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next)
Merging pci/next (a314966fad61 Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-layerscape' and 'pci/host-rcar' into next)
Merging hid/for-next (4ed76d1877c8 Merge branch 'for-4.6/cmedia' into for-next)
Merging i2c/i2c/for-next (3bf58bb5da86 i2c: imx: remove extra spaces.)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (d3c24a1f7798 Doc: hwmon: Fix typo "montoring" in hwmon)
Merging v4l-dvb/master (7529bf2f7a3a Merge ../patchwork into to_next)
Merging kbuild/for-next (94b0432df4fa Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (212199b71be7 Merge branch 'for-4.5-fixes' into for-next)
Merging pm/linux-next (767acf5299ee Merge branch 'pm-sleep-fixes' into linux-next)
Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (192cb9ee6547 thermal: intel_pch_thermal: Enable Skylake PCH thermal)
Merging thermal-soc/next (6427895d808e Merge branch 'work-fixes' into work-next)
Merging ieee1394/for-next (575913946989 firewire: ABI documentation: jujuutils were renamed to linux-firewire-utils)
Merging dlm/next (b81171cb6869 DLM: Save and restore socket callbacks properly)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (0d059b5a7cd3 Merge branch 'topic/pl330' into next)
Merging net-next/master (1f27cde313d7 net: sched: use pfifo_fast for non real queues)
CONFLICT (content): Merge conflict in include/uapi/linux/bpf.h
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/fw.c
CONFLICT (content): Merge conflict in drivers/net/vxlan.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_main.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en.h
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (0a44b22009d5 rtlwifi: rtl8821ae: Convert driver to use common 5G channel table)
Merging bluetooth/master (1932597b739d Bluetooth: btusb: Add a new AR3012 ID 13d3:3472)
Merging mac80211-next/master (0a87cadbb54e nl80211: add feature for BSS selection support)
Merging rdma/for-next (18558cae0272 Linux 4.5-rc4)
Merging mtd/master (44248affb5d8 MAINTAINERS: add maintainer entry for FREESCALE GPMI NAND driver)
Merging l2-mtd/master (5817b9dc9cc1 jffs2: Improve post-mount CRC scan efficiency)
Merging crypto/master (ce0ae266feaf crypto: ccp - memset request context to zero during import)
CONFLICT (content): Merge conflict in net/ipv4/tcp.c
CONFLICT (modify/delete): fs/f2fs/f2fs_crypto.h deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/f2fs_crypto.h left in tree.
CONFLICT (modify/delete): fs/f2fs/crypto_key.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto_key.c left in tree.
CONFLICT (modify/delete): fs/f2fs/crypto.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto.c left in tree.
CONFLICT (content): Merge conflict in fs/crypto/fname.c
$ git rm -f fs/f2fs/f2fs_crypto.h fs/f2fs/crypto_key.c fs/f2fs/crypto.c
Merging drm/drm-next (42e856067843 Merge tag 'imx-drm-next-20160301' of git://git.pengutronix.de/git/pza/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/exynos/exynos_drm_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/exynos/exynos_drm_fbdev.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h
Applying: drm: fix bad merge of drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Merging drm-panel/drm/panel/for-next (c8a3b2ae0713 drm/bridge: Make (pre/post) enable/disable callbacks optional)
Merging drm-intel/for-linux-next (5ba001783ba6 drm/i915: Do not wait atomically for display clocks)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_csr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
Merging drm-tegra/drm/tegra/for-next (26ff27e69ee2 gpu: host1x: Set DMA ops on device creation)
Merging drm-misc/topic/drm-misc (327097930d65 drm/crtc: Use drm_mode_object_put() in __drm_framebuffer_unregister())
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols)
Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.)
Merging drm-vc4/drm-vc4-next (fc04023fafec drm/vc4: Add support for YUV planes.)
Merging regmap/for-next (57837844a3aa Merge remote-tracking branches 'regmap/topic/doc', 'regmap/topic/irq', 'regmap/topic/stride' and 'regmap/topic/update-bits' into regmap-next)
Merging sound/for-next (03367bf7fd30 ALSA: portman2x4: fix NULL pointer dereference)
Merging sound-asoc/for-next (3b114d1f1d86 Merge remote-tracking branches 'asoc/topic/ssm4567', 'asoc/topic/sunxi', 'asoc/topic/topology' and 'asoc/topic/wm8974' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (564a68de8e82 Input: stmpe-ts - restore kerneldoc)
Merging block/for-next (3fe7a75379c6 Merge branch 'for-4.6/core' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging device-mapper/for-next (f838997d1784 dm: return error if bio_integrity_clone() fails in clone_bio())
$ git reset --hard HEAD^
Merging next-20160303 version of device-mapper
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (887171c73075 mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (70d9798b9556 MD: warn for potential deadlock)
Merging mfd/for-mfd-next (103d8a7bb8a2 mfd: tps65090: Set regmap config reg counts properly)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (0df6e32b0e36 power: pm2301-charger: use __maybe_unused to hide pm functions)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (830f71c600cc Merge remote-tracking branches 'regulator/topic/mt6397', 'regulator/topic/s2mps11', 'regulator/topic/s5m8767' and 'regulator/topic/vexpress' into regulator-next)
Merging security/next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging keys/keys-next (4e8ae72a75aa X.509: Make algo identifiers text instead of enum)
Merging selinux/next (9090a2d5e3e6 selinux: use absolute path to include directory)
Merging tpmdd/next (2c4934e534eb Merge branch 'master' into next)
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (c36a483d8007 watchdog: Add watchdog timer support for the WinSystems EBC-C384)
Merging iommu/next (d459a0941140 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/io-pgtable', 'arm/renesas' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/memory/Kconfig
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/mediatek/mt8173.dtsi
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
Merging jc_docs/docs-next (510e64fb0423 Doc: ARM: Fix a typo in clksrc-change-registers.awk)
Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix)
Merging audit/next (fd97646b0595 audit: Fix typo in comment)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (299b207dbce8 Input: ads7846: Add description how to use internal reference (ADS7846))
Merging mailbox/mailbox-for-next (789c59acc323 mailbox: Hi6220: add mailbox driver)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apm/apm-storm.dtsi
Merging spi/for-next (bea3704efd27 Merge remote-tracking branches 'spi/topic/rockchip', 'spi/topic/sh' and 'spi/topic/ti-qspi' into spi-next)
Merging tip/auto-latest (954af4b5fd2c Merge branch 'x86/timers')
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/efistub.h
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/arm64-stub.c
CONFLICT (content): Merge conflict in drivers/cpufreq/intel_pstate.c
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (7cc5a5d3cd4c ARM: socfpga: Enable OCRAM ECC on startup)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (7fd13615992a tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on)
Merging rcu/rcu/next (25f0d48a4299 Merge commit 'abedf8e2419fb873d919dd74de2e84b510259339' into wagi.2016.03.01a)
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Merging kvm/linux-next (13d268ca2c4c KVM: MMU: apply page track notifier)
CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_64_vio_hv.c
Merging kvm-arm/next (9b4a3004439d KVM: arm/arm64: timer: Add active state caching)
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp.S
CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h
CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
Merging kvms390/next (bac8fe570aac KVM: s390: wake up when the VCPU cpu timer expires)
Merging xen-tip/linux-next (a4cdb556cae0 xen/gntdev: add ioctl for grant copy)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (9b7f6597f013 sched/core: Get rid of 'cpu' argument in wq_worker_sleeping())
Merging drivers-x86/for-next (2d6cace8476a ideapad-laptop: Add ideapad Y700 (15) to the no_hw_rfkill DMI list)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (3e8d09d79e63 leds: gpio: Use GPIOF_OUT_INIT_LOW instead of hardcoded zero)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (112d125a8947 Revert "driver-core: platform: probe of-devices only using list of compatibles")
Merging tty/tty-next (a3f0b77f36ca sc16is7xx: implemented get_mctrl)
Merging usb/usb-next (7b05d3b37437 Merge tag 'usb-ci-v4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next)
Merging usb-gadget/next (4082ae2f6a8e usb: renesas_usbhs: gadget: fix giveback status code in usbhsg_pipe_disable())
Merging usb-serial/usb-next (7084fa868b50 USB: serial: cp210x: add new access functions for large registers)
Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
Merging staging/staging-next (ea363b419f5c staging: lustre: do less intense allocating retry for ko2iblnd)
CONFLICT (content): Merge conflict in include/linux/irqdomain.h
CONFLICT (content): Merge conflict in drivers/watchdog/Makefile
CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
CONFLICT (modify/delete): drivers/staging/dgap/dgap.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgap/dgap.c left in tree.
CONFLICT (content): Merge conflict in drivers/media/dvb-frontends/mn88473.c
CONFLICT (content): Merge conflict in drivers/base/firmware_class.c
$ git rm -f drivers/staging/dgap/dgap.c
Applying: staging: mark CONFIG_FSL_MC_BUS as broken for now
Merging char-misc/char-misc-next (d74e026ae5c4 Merge tag 'lkdtm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-testing)
Merging extcon/extcon-next (ae64e42cc2b3 extcon: palmas: Drop IRQF_EARLY_RESUME flag)
Merging cgroup/for-next (43dee95c102e Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (3e1cc7df8efc Merge branch 'misc' into for-next)
Merging target-updates/for-next (02fe93a816ff target/user: Report capability of handling out-of-order completions to userspace)
Merging target-merge/for-next-merge (b46008b4854a iscsi-target: update Kconfig and Makefile)
CONFLICT (content): Merge conflict in drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
Merging pinctrl/for-next (cf48fde5f6c9 Merge branch 'devel' into for-next)
Merging vhost/linux-next (2f47f0294edd virtio_balloon: Allow to resize and update the balloon stats in parallel)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (531dd08c87bd Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in tools/Makefile
CONFLICT (content): Merge conflict in drivers/pinctrl/sunxi/pinctrl-sunxi.c
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/Kconfig
CONFLICT (content): Merge conflict in MAINTAINERS
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (ff01c944cfa9 pwm: Mark all devices as "might sleep")
Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (8626556f2593 clk: lpc32xx: fix compilation warning)
CONFLICT (content): Merge conflict in drivers/clk/at91/clk-master.c
CONFLICT (content): Merge conflict in drivers/clk/at91/clk-main.c
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (fb2e69217129 aio: Fix compile error due to unexpected use of cmpxchg())
$ git reset --hard HEAD^
Merging next-20160111 version of aio
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (6accd8e9bf22 selftests: media_dcevice_test fix usage information)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (4c5e6154516b Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging coresight/next (f1e2c1b13dfa drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular)
CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm3x.c
CONFLICT (add/add): Merge conflict in drivers/hwtracing/coresight/coresight-etm-perf.c
Merging rtc/rtc-next (bbdfdcad60e2 rtc: enable COMPILE_TEST)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36f90b0a2ddd Linux 4.5-rc2)
Merging akpm-current/current (6b0b69f03576 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in mm/mprotect.c
CONFLICT (content): Merge conflict in mm/huge_memory.c
CONFLICT (content): Merge conflict in fs/ocfs2/aops.c
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/Makefile
CONFLICT (content): Merge conflict in arch/x86/realmode/rm/Makefile
CONFLICT (content): Merge conflict in arch/x86/kernel/Makefile
CONFLICT (content): Merge conflict in arch/x86/entry/vdso/Makefile
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl
CONFLICT (content): Merge conflict in arch/x86/boot/compressed/Makefile
CONFLICT (content): Merge conflict in arch/x86/boot/Makefile
CONFLICT (content): Merge conflict in arch/mips/Kconfig
Applying: mm: cleanup *pte_alloc* interfaces fix
Applying: mm: cleanup *pte_alloc* interfaces fix 2
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (fc99d7aa98e3 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* next-20160304 build: 2 failures 18 warnings (next-20160304)
From: Build bot for Mark Brown @ 2016-03-04 11:08 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160304
Git describe: next-20160304
Commit: d10bf08fe1 Add linux-next specific files for 20160304
Build Time: 75 min 54 sec
Passed: 7 / 9 ( 77.78 %)
Failed: 2 / 9 ( 22.22 %)
Errors: 22
Warnings: 18
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_set' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_test' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_return' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_unless' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_freeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_unfreeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_set' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_test' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_return' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_unless' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_freeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_unfreeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
../mm/debug_page_ref.c:8:21: error: passing argument 1 of 'trace_page_ref_set' from incompatible pointer type [-Werror=incompatible-pointer-types]
../mm/debug_page_ref.c:15:21: error: passing argument 1 of 'trace_page_ref_mod' from incompatible pointer type [-Werror=incompatible-pointer-types]
../mm/debug_page_ref.c:22:30: error: passing argument 1 of 'trace_page_ref_mod_and_test' from incompatible pointer type [-Werror=incompatible-pointer-types]
../mm/debug_page_ref.c:29:32: error: passing argument 1 of 'trace_page_ref_mod_and_return' from incompatible pointer type [-Werror=incompatible-pointer-types]
../mm/debug_page_ref.c:36:28: error: passing argument 1 of 'trace_page_ref_mod_unless' from incompatible pointer type [-Werror=incompatible-pointer-types]
../mm/debug_page_ref.c:43:24: error: passing argument 1 of 'trace_page_ref_freeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
../mm/debug_page_ref.c:50:26: error: passing argument 1 of 'trace_page_ref_unfreeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
arm-allmodconfig
../include/asm-generic/div64.h:224:22: error: passing argument 1 of '__div64_32' from incompatible pointer type [-Werror=incompatible-pointer-types]
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm-multi_v7_defconfig
48 warnings 0 mismatches : arm64-allmodconfig
1 warnings 0 mismatches : arm-allnoconfig
10 warnings 0 mismatches : arm-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
-------------------------------------------------------------------------------
Errors summary: 22
1 ../mm/debug_page_ref.c:8:21: error: passing argument 1 of 'trace_page_ref_set' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../mm/debug_page_ref.c:50:26: error: passing argument 1 of 'trace_page_ref_unfreeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../mm/debug_page_ref.c:43:24: error: passing argument 1 of 'trace_page_ref_freeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../mm/debug_page_ref.c:36:28: error: passing argument 1 of 'trace_page_ref_mod_unless' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../mm/debug_page_ref.c:29:32: error: passing argument 1 of 'trace_page_ref_mod_and_return' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../mm/debug_page_ref.c:22:30: error: passing argument 1 of 'trace_page_ref_mod_and_test' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../mm/debug_page_ref.c:15:21: error: passing argument 1 of 'trace_page_ref_mod' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_unfreeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_set' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_unless' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_test' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_return' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_freeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_unfreeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_set' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_unless' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_test' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_return' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_freeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../include/asm-generic/div64.h:224:22: error: passing argument 1 of '__div64_32' from incompatible pointer type [-Werror=incompatible-pointer-types]
Warnings Summary: 18
6 <stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
6 ../include/trace/events/page_ref.h:97:18: warning: 'struct page' declared inside parameter list
6 ../include/trace/events/page_ref.h:54:18: warning: 'struct page' declared inside parameter list
6 ../include/trace/events/page_ref.h:47:18: warning: 'struct page' declared inside parameter list
6 ../include/trace/events/page_ref.h:125:18: warning: 'struct page' declared inside parameter list
6 ../include/trace/events/page_ref.h:118:18: warning: 'struct page' declared inside parameter list
6 ../include/trace/events/page_ref.h:111:18: warning: 'struct page' declared inside parameter list
6 ../include/trace/events/page_ref.h:104:18: warning: 'struct page' declared inside parameter list
4 ../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
2 ../include/asm-generic/div64.h:207:28: warning: comparison of distinct pointer types lacks a cast
2 ../drivers/platform/goldfish/goldfish_pipe.c:312:3: warning: 'get_user_pages8' is deprecated [-Wdeprecated-declarations]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../include/trace/events/page_ref.h:47:18: warning: its scope is only this definition or declaration, which is probably not what you want
1 ../include/linux/kern_levels.h:4:18: warning: format '%llx' expects argument of type 'long long unsigned int', but argument 8 has type 'dma_addr_t {aka unsigned int}' [-Wformat=]
1 ../include/asm-generic/div64.h:220:25: warning: right shift count >= width of type [-Wshift-count-overflow]
1 ../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 21 errors, 48 warnings, 0 section mismatches
Errors:
../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_set' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_test' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_return' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_unless' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_freeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/trace_events.h:703:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_unfreeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_set' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_test' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_return' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_mod_unless' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_freeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
../include/trace/perf.h:83:35: error: passing argument 1 of 'check_trace_callback_type_page_ref_unfreeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
../mm/debug_page_ref.c:8:21: error: passing argument 1 of 'trace_page_ref_set' from incompatible pointer type [-Werror=incompatible-pointer-types]
../mm/debug_page_ref.c:15:21: error: passing argument 1 of 'trace_page_ref_mod' from incompatible pointer type [-Werror=incompatible-pointer-types]
../mm/debug_page_ref.c:22:30: error: passing argument 1 of 'trace_page_ref_mod_and_test' from incompatible pointer type [-Werror=incompatible-pointer-types]
../mm/debug_page_ref.c:29:32: error: passing argument 1 of 'trace_page_ref_mod_and_return' from incompatible pointer type [-Werror=incompatible-pointer-types]
../mm/debug_page_ref.c:36:28: error: passing argument 1 of 'trace_page_ref_mod_unless' from incompatible pointer type [-Werror=incompatible-pointer-types]
../mm/debug_page_ref.c:43:24: error: passing argument 1 of 'trace_page_ref_freeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
../mm/debug_page_ref.c:50:26: error: passing argument 1 of 'trace_page_ref_unfreeze' from incompatible pointer type [-Werror=incompatible-pointer-types]
Warnings:
../include/trace/events/page_ref.h:47:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:47:18: warning: its scope is only this definition or declaration, which is probably not what you want
../include/trace/events/page_ref.h:47:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:47:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:47:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:47:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:47:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:54:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:54:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:54:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:54:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:54:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:54:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:97:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:97:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:97:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:97:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:97:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:97:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:104:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:104:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:104:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:104:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:104:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:104:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:111:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:111:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:111:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:111:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:111:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:111:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:118:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:118:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:118:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:118:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:118:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:118:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:125:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:125:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:125:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:125:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:125:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:125:18: warning: 'struct page' declared inside parameter list
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../drivers/platform/goldfish/goldfish_pipe.c:312:3: warning: 'get_user_pages8' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 1 errors, 10 warnings, 0 section mismatches
Errors:
../include/asm-generic/div64.h:224:22: error: passing argument 1 of '__div64_32' from incompatible pointer type [-Werror=incompatible-pointer-types]
Warnings:
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../include/asm-generic/div64.h:207:28: warning: comparison of distinct pointer types lacks a cast
../include/asm-generic/div64.h:207:28: warning: comparison of distinct pointer types lacks a cast
../include/asm-generic/div64.h:220:25: warning: right shift count >= width of type [-Wshift-count-overflow]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
../drivers/platform/goldfish/goldfish_pipe.c:312:3: warning: 'get_user_pages8' is deprecated [-Wdeprecated-declarations]
../include/linux/kern_levels.h:4:18: warning: format '%llx' expects argument of type 'long long unsigned int', but argument 8 has type 'dma_addr_t {aka unsigned int}' [-Wformat=]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
x86_64-defconfig
arm64-defconfig
^ permalink raw reply
* Re: linux-next: manual merge of the rcu tree with the tip tree
From: Paul E. McKenney @ 2016-03-04 15:04 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel, Boqun Feng
In-Reply-To: <20160304151306.05e3bb36@canb.auug.org.au>
On Fri, Mar 04, 2016 at 03:13:06PM +1100, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> kernel/rcu/tree.c
>
> between commit:
>
> 27d50c7eeb0f ("rcu: Make CPU_DYING_IDLE an explicit call")
>
> from the tip tree and commit:
>
> 67c583a7de34 ("RCU: Privatize rcu_node::lock")
>
> from the rcu tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thank you! I have applied this resolution to -rcu and am testing it.
Thanx, Paul
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc kernel/rcu/tree.c
> index 0bbc1497a0e4,55cea189783f..000000000000
> --- a/kernel/rcu/tree.c
> +++ b/kernel/rcu/tree.c
> @@@ -4227,43 -4246,6 +4224,43 @@@ static void rcu_prepare_cpu(int cpu
> rcu_init_percpu_data(cpu, rsp);
> }
>
> +#ifdef CONFIG_HOTPLUG_CPU
> +/*
> + * The CPU is exiting the idle loop into the arch_cpu_idle_dead()
> + * function. We now remove it from the rcu_node tree's ->qsmaskinit
> + * bit masks.
> + */
> +static void rcu_cleanup_dying_idle_cpu(int cpu, struct rcu_state *rsp)
> +{
> + unsigned long flags;
> + unsigned long mask;
> + struct rcu_data *rdp = per_cpu_ptr(rsp->rda, cpu);
> + struct rcu_node *rnp = rdp->mynode; /* Outgoing CPU's rdp & rnp. */
> +
> + if (!IS_ENABLED(CONFIG_HOTPLUG_CPU))
> + return;
> +
> + /* Remove outgoing CPU from mask in the leaf rcu_node structure. */
> + mask = rdp->grpmask;
> + raw_spin_lock_irqsave_rcu_node(rnp, flags); /* Enforce GP memory-order guarantee. */
> + rnp->qsmaskinitnext &= ~mask;
> - raw_spin_unlock_irqrestore(&rnp->lock, flags);
> ++ raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
> +}
> +
> +void rcu_report_dead(unsigned int cpu)
> +{
> + struct rcu_state *rsp;
> +
> + /* QS for any half-done expedited RCU-sched GP. */
> + preempt_disable();
> + rcu_report_exp_rdp(&rcu_sched_state,
> + this_cpu_ptr(rcu_sched_state.rda), true);
> + preempt_enable();
> + for_each_rcu_flavor(rsp)
> + rcu_cleanup_dying_idle_cpu(cpu, rsp);
> +}
> +#endif
> +
> /*
> * Handle CPU online/offline notification events.
> */
>
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the v4l-dvb tree
From: Greg KH @ 2016-03-04 16:58 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mauro Carvalho Chehab, linux-next, linux-kernel,
Janani Ravichandran, Antti Palosaari
In-Reply-To: <20160304162444.7f043991@canb.auug.org.au>
On Fri, Mar 04, 2016 at 04:24:44PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/media/dvb-frontends/mn88473.c
>
> between commit:
>
> 7908fad99a6c ("[media] mn88473: finalize driver")
>
> from the v4l-dvb tree and commit:
>
> 3a35be2a1443 ("staging: media: Remove unneeded parentheses")
>
> from the staging tree.
>
> I fixed it up (I just used the v4l-dvb tree version) and can carry the
> fix as necessary (no action is required).
Thanks for this, that sounds fine.
greg k-h
^ permalink raw reply
* Re: ext2/3 using ext4 module mkdir IO error on pmem DAX mount
From: lokesh jaliminche @ 2016-03-04 18:26 UTC (permalink / raw)
To: Theodore Ts'o, lokesh jaliminche, Ross Zwisler, Xiong Zhou,
Andreas Dilger, linux-nvdimm, linux-ext4, linux-next,
linux-kernel
In-Reply-To: <20160303234904.GF24012@thunk.org>
ok, no issues and thanks for the information above.I will take care of
these things while sending corrected version of this patch.
Thanks & Regards,
Lokesh
On Fri, Mar 4, 2016 at 5:19 AM, Theodore Ts'o <tytso@mit.edu> wrote:
> On Thu, Mar 03, 2016 at 10:49:51PM +0530, lokesh jaliminche wrote:
>> Hi,
>> I have tested it locally I am also getting same error but not
>> consistently. I have put some debug logs for debugging, as per the logs
>> it seems that block_group is not getting initialized properly. I am
>> not sure weather this is because of my patch. Need to debug more.
>
> I'm quite sure it's your patch, so I'm going to drop it for now. Note
> that with ext3, we don't have flex_bg's (the flex_bg size is 1).
>
> Here's a reliable repro:
>
> kvm-xfstests --no-log -c ext3 generic/003
>
> For more about kvm-xfstests
>
> https://git.kernel.org/cgit/fs/ext2/xfstests-bld.git/tree/quick-start?h=META
>
> Output from running this test:
>
> BEGIN TEST ext3: Ext4 4k block emulating ext3 Thu Mar 3 18:39:33 EST 2016
> DEVICE: /dev/vdd
> MK2FS OPTIONS: -q -O ^extents,^flex_bg,^uninit_bg,^64bit,^metadata_csum,^huge_file,^dir_nlink,^extra_isize
> MOUNT OPTIONS: -o block_validity,nodelalloc
> FSTYP -- ext4
> PLATFORM -- Linux/i686 kvm-xfstests 4.5.0-rc2-00026-g1f2d779
> MKFS_OPTIONS -- -q -O ^extents,^flex_bg,^uninit_bg,^64bit,^metadata_csum,^huge_file,^dir_nlink,^extra_isize /dev/vdc
> MOUNT_OPTIONS -- -o acl,user_xattr -o block_validity,nodelalloc /dev/vdc /vdc
>
> generic/003 [18:39:35][ 13.096353] run fstests generic/003 at 2016-03-03 18:39:35
> [ 14.859764] EXT4-fs error (device vdc): ext4_get_group_desc:288: comm mkdir: block_group >= groups_count - block_group = 850480444, groups_count = 40
> [ 16.944808] EXT4-fs (vdc): warning: mounting fs with errors, running e2fsck is recommended
> [ 16.956276] EXT4-fs error (device vdc): ext4_get_group_desc:288: comm mkdir: block_group >= groups_count - block_group = 3221700656, groups_count = 40
> [ 19.023011] EXT4-fs (vdc): warning: mounting fs with errors, running e2fsck is recommended
> [ 22.104702] EXT4-fs (vdc): warning: mounting fs with errors, running e2fsck is recommended
> [18:39:46] - output mismatch (see /results/results-ext3/generic/003.out.bad)
> --- tests/generic/003.out 2016-02-29 22:18:21.000000000 -0500
> +++ /results/results-ext3/generic/003.out.bad 2016-03-03 18:39:46.587676694 -0500
> @@ -1,2 +1,46 @@
> QA output created by 003
> +mkdir: cannot create directory '/vdc/dir1': Input/output error
> +./tests/generic/003: line 93: /vdc/dir1/file1: No such file or directory
> +stat: cannot stat '/vdc/dir1/file1': No such file or directory
> +cat: /vdc/dir1/file1: No such file or directory
> +stat: cannot stat '/vdc/dir1/file1': No such file or directory
> +ERROR: access time has not been updated after accessing file1 first time
> ...
> (Run 'diff -u tests/generic/003.out /results/results-ext3/generic/003.out.bad' to see the entire diff)
> Ran: generic/003
> Failures: generic/003
> Failed 1 of 1 tests
>
> (In fact a huge number of tests fail using the ext3 configuration, but
> generic/003 is a quick fast test. Before submitting patches, please
> run at the very least "kvm-xfstests smoke". Admittedly, for this bug
> the smoke test wouldn't have been enough. You would have needed
> "kvm-xfstests-g quick", or preferably, "kvm-xfstests -g auto".
> Alternatively, you can use gce-xfstests, which uses Google Compute
> Engine where you can just fire off the tests, and it will send you
> e-mail with the test results. See
> https://git.kernel.org/cgit/fs/ext2/xfstests-bld.git/tree/kvm-xfstests/README.GCE
> for more information.)
>
> - Ted
^ permalink raw reply
* linux-next: manual merge of the arm64 tree with Linus' tree
From: Stephen Rothwell @ 2016-03-06 23:48 UTC (permalink / raw)
To: Catalin Marinas; +Cc: linux-next, linux-kernel, Ard Biesheuvel, Will Deacon
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/mm/init.c
between commit:
dfd55ad85e4a ("arm64: vmemmap: use virtual projection of linear region")
from Linus' tree and commit:
c031a4213c11 ("arm64: kaslr: randomize the linear region")
from the arm64 tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/mm/init.c
index 7802f216a67a,8c3d7dd91c25..000000000000
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@@ -317,11 -382,16 +382,16 @@@ void __init mem_init(void
#ifdef CONFIG_KASAN
MLG(KASAN_SHADOW_START, KASAN_SHADOW_END),
#endif
+ MLM(MODULES_VADDR, MODULES_END),
MLG(VMALLOC_START, VMALLOC_END),
+ MLK_ROUNDUP(_text, __start_rodata),
+ MLK_ROUNDUP(__start_rodata, _etext),
+ MLK_ROUNDUP(__init_begin, __init_end),
+ MLK_ROUNDUP(_sdata, _edata),
#ifdef CONFIG_SPARSEMEM_VMEMMAP
- MLG((unsigned long)vmemmap,
- (unsigned long)vmemmap + VMEMMAP_SIZE),
+ MLG(VMEMMAP_START,
+ VMEMMAP_START + VMEMMAP_SIZE),
- MLM((unsigned long)virt_to_page(PAGE_OFFSET),
+ MLM((unsigned long)phys_to_page(memblock_start_of_DRAM()),
(unsigned long)virt_to_page(high_memory)),
#endif
MLK(FIXADDR_START, FIXADDR_TOP),
^ permalink raw reply
* linux-next: manual merge of the crypto tree with the net-next tree
From: Stephen Rothwell @ 2016-03-07 2:18 UTC (permalink / raw)
To: Herbert Xu, David Miller, netdev; +Cc: linux-next, linux-kernel, David Howells
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in:
net/rxrpc/rxkad.c
between commit:
0d12f8a4027d ("rxrpc: Keep the skb private record of the Rx header in host byte order")
from the net-next tree and commit:
1afe593b4239 ("rxrpc: Use skcipher")
from the crypto tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc net/rxrpc/rxkad.c
index 3106a0c4960b,0d96b48a6492..000000000000
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@@ -128,21 -128,23 +128,23 @@@ static void rxkad_prime_packet_security
token = conn->key->payload.data[0];
memcpy(&iv, token->kad->session_key, sizeof(iv));
- desc.tfm = conn->cipher;
- desc.info = iv.x;
- desc.flags = 0;
-
- tmpbuf.x[0] = conn->epoch;
- tmpbuf.x[1] = conn->cid;
+ tmpbuf.x[0] = htonl(conn->epoch);
+ tmpbuf.x[1] = htonl(conn->cid);
tmpbuf.x[2] = 0;
tmpbuf.x[3] = htonl(conn->security_ix);
sg_init_one(&sg[0], &tmpbuf, sizeof(tmpbuf));
sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf));
- crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf));
+
+ skcipher_request_set_tfm(req, conn->cipher);
+ skcipher_request_set_callback(req, 0, NULL, NULL);
+ skcipher_request_set_crypt(req, &sg[1], &sg[0], sizeof(tmpbuf), iv.x);
+
+ crypto_skcipher_encrypt(req);
+ skcipher_request_zero(req);
memcpy(&conn->csum_iv, &tmpbuf.x[2], sizeof(conn->csum_iv));
- ASSERTCMP(conn->csum_iv.n[0], ==, tmpbuf.x[2]);
+ ASSERTCMP((u32 __force)conn->csum_iv.n[0], ==, (u32 __force)tmpbuf.x[2]);
_leave("");
}
@@@ -251,12 -267,12 +267,12 @@@ out
* checksum an RxRPC packet header
*/
static int rxkad_secure_packet(const struct rxrpc_call *call,
- struct sk_buff *skb,
- size_t data_size,
- void *sechdr)
+ struct sk_buff *skb,
+ size_t data_size,
+ void *sechdr)
{
struct rxrpc_skb_priv *sp;
- struct blkcipher_desc desc;
+ SKCIPHER_REQUEST_ON_STACK(req, call->conn->cipher);
struct rxrpc_crypt iv;
struct scatterlist sg[2];
struct {
@@@ -280,15 -297,12 +296,12 @@@
/* continue encrypting from where we left off */
memcpy(&iv, call->conn->csum_iv.x, sizeof(iv));
- desc.tfm = call->conn->cipher;
- desc.info = iv.x;
- desc.flags = 0;
/* calculate the security checksum */
- x = htonl(call->channel << (32 - RXRPC_CIDSHIFT));
- x |= sp->hdr.seq & cpu_to_be32(0x3fffffff);
- tmpbuf.x[0] = sp->hdr.callNumber;
- tmpbuf.x[1] = x;
+ x = call->channel << (32 - RXRPC_CIDSHIFT);
+ x |= sp->hdr.seq & 0x3fffffff;
+ tmpbuf.x[0] = htonl(sp->hdr.callNumber);
+ tmpbuf.x[1] = htonl(x);
sg_init_one(&sg[0], &tmpbuf, sizeof(tmpbuf));
sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf));
@@@ -513,25 -539,29 +536,28 @@@ static int rxkad_verify_packet(const st
/* continue encrypting from where we left off */
memcpy(&iv, call->conn->csum_iv.x, sizeof(iv));
- desc.tfm = call->conn->cipher;
- desc.info = iv.x;
- desc.flags = 0;
/* validate the security checksum */
- x = htonl(call->channel << (32 - RXRPC_CIDSHIFT));
- x |= sp->hdr.seq & cpu_to_be32(0x3fffffff);
- tmpbuf.x[0] = call->call_id;
- tmpbuf.x[1] = x;
+ x = call->channel << (32 - RXRPC_CIDSHIFT);
+ x |= sp->hdr.seq & 0x3fffffff;
+ tmpbuf.x[0] = htonl(call->call_id);
+ tmpbuf.x[1] = htonl(x);
sg_init_one(&sg[0], &tmpbuf, sizeof(tmpbuf));
sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf));
- crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf));
+
+ skcipher_request_set_tfm(req, call->conn->cipher);
+ skcipher_request_set_callback(req, 0, NULL, NULL);
+ skcipher_request_set_crypt(req, &sg[1], &sg[0], sizeof(tmpbuf), iv.x);
+
+ crypto_skcipher_encrypt(req);
+ skcipher_request_zero(req);
y = ntohl(tmpbuf.x[1]);
- y = (y >> 16) & 0xffff;
- if (y == 0)
- y = 1; /* zero checksums are not permitted */
+ cksum = (y >> 16) & 0xffff;
+ if (cksum == 0)
+ cksum = 1; /* zero checksums are not permitted */
- cksum = htons(y);
if (sp->hdr.cksum != cksum) {
*_abort_code = RXKADSEALEDINCON;
_leave(" = -EPROTO [csum failed]");
^ permalink raw reply
* linux-next: manual merge of the block tree with Linus' tree
From: Stephen Rothwell @ 2016-03-07 3:08 UTC (permalink / raw)
To: Jens Axboe
Cc: linux-next, linux-kernel, Keith Busch, Sagi Grimberg,
Christoph Hellwig
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
drivers/nvme/host/pci.c
between commit:
ff23a2a15a21 ("NVMe: Poll device while still active during remove")
f8e68a7c9af5 ("NVMe: Rate limit nvme IO warnings")
b00a726a9fd8 ("NVMe: Don't unmap controller registers on reset")
646017a612e7 ("NVMe: Fix namespace removal deadlock")
f58944e265d4 ("NVMe: Simplify device reset failure")
from Linus' tree and commit:
949928c1c731 ("NVMe: Fix possible queue use after freed")
1b3c47c182aa ("nvme: Log the ctrl device name instead of the underlying pci device name")
9396dec916c0 ("nvme: use a work item to submit async event requests")
2d55cd5f511d ("nvme: replace the kthread with a per-device watchdog timer")
from the block tree.
I fixed it up (maybe - see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/nvme/host/pci.c
index 680f5780750c,d47b08783110..000000000000
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@@ -310,10 -288,10 +299,10 @@@ static void nvme_complete_async_event(s
switch (result & 0xff07) {
case NVME_AER_NOTICE_NS_CHANGED:
- dev_info(dev->dev, "rescanning\n");
+ dev_info(dev->ctrl.device, "rescanning\n");
- queue_work(nvme_workq, &dev->scan_work);
+ nvme_queue_scan(dev);
default:
- dev_warn(dev->dev, "async event result %08x\n", result);
+ dev_warn(dev->ctrl.device, "async event result %08x\n", result);
}
}
@@@ -1018,7 -992,7 +1011,7 @@@ static void nvme_cancel_queue_ios(struc
if (!blk_mq_request_started(req))
return;
- dev_dbg_ratelimited(nvmeq->q_dmadev,
- dev_warn(nvmeq->dev->ctrl.device,
++ dev_dbg_ratelimited(nvmeq->dev->ctrl.device,
"Cancelling I/O %d QID %d\n", req->tag, nvmeq->qid);
status = NVME_SC_ABORT_REQ;
@@@ -1709,8 -1651,14 +1676,14 @@@ static int nvme_dev_add(struct nvme_de
if (blk_mq_alloc_tag_set(&dev->tagset))
return 0;
dev->ctrl.tagset = &dev->tagset;
+ } else {
+ blk_mq_update_nr_hw_queues(&dev->tagset, dev->online_queues - 1);
+
+ /* Free previously allocated queues that are no longer usable */
+ nvme_free_queues(dev, dev->online_queues);
}
+
- queue_work(nvme_workq, &dev->scan_work);
+ nvme_queue_scan(dev);
return 0;
}
@@@ -1845,10 -1763,10 +1774,10 @@@ static void nvme_dev_disable(struct nvm
int i;
u32 csts = -1;
- nvme_dev_list_remove(dev);
+ del_timer_sync(&dev->watchdog_timer);
mutex_lock(&dev->shutdown_lock);
- if (dev->bar) {
+ if (pci_is_enabled(to_pci_dev(dev->dev))) {
nvme_stop_queues(&dev->ctrl);
csts = readl(dev->bar + NVME_REG_CSTS);
}
@@@ -1951,13 -1859,12 +1880,12 @@@ static void nvme_reset_work(struct work
result = nvme_setup_io_queues(dev);
if (result)
- goto free_tags;
+ goto out;
dev->ctrl.event_limit = NVME_NR_AEN_COMMANDS;
+ queue_work(nvme_workq, &dev->async_work);
- result = nvme_dev_list_add(dev);
- if (result)
- goto out;
+ mod_timer(&dev->watchdog_timer, round_jiffies(jiffies + HZ));
/*
* Keep the controller around but remove all namespaces if we don't have
@@@ -2085,11 -1988,6 +2014,10 @@@ static int nvme_probe(struct pci_dev *p
dev->dev = get_device(&pdev->dev);
pci_set_drvdata(pdev, dev);
+ result = nvme_dev_map(dev);
+ if (result)
+ goto free;
+
- INIT_LIST_HEAD(&dev->node);
INIT_WORK(&dev->scan_work, nvme_dev_scan);
INIT_WORK(&dev->reset_work, nvme_reset_work);
INIT_WORK(&dev->remove_work, nvme_remove_dead_ctrl_work);
@@@ -2145,8 -2042,11 +2078,11 @@@ static void nvme_remove(struct pci_dev
{
struct nvme_dev *dev = pci_get_drvdata(pdev);
+ set_bit(NVME_CTRL_REMOVING, &dev->flags);
+ del_timer_sync(&dev->watchdog_timer);
+
pci_set_drvdata(pdev, NULL);
+ flush_work(&dev->async_work);
- flush_work(&dev->reset_work);
flush_work(&dev->scan_work);
nvme_remove_namespaces(&dev->ctrl);
nvme_uninit_ctrl(&dev->ctrl);
^ permalink raw reply
* linux-next: manual merge of the block tree with Linus' tree
From: Stephen Rothwell @ 2016-03-07 3:12 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel, Keith Busch, Christoph Hellwig
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
drivers/nvme/host/core.c
between commit:
075790ebba4a ("NVMe: Use IDA for namespace disk naming")
from Linus' tree and commit:
f4f0f63e6f01 ("nvme: fix drvdata setup for the nvme device")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/nvme/host/core.c
index 03c46412fff4,f08dccee8143..000000000000
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@@ -561,13 -598,9 +603,13 @@@ static int nvme_revalidate_disk(struct
u16 old_ms;
unsigned short bs;
+ if (test_bit(NVME_NS_DEAD, &ns->flags)) {
+ set_capacity(disk, 0);
+ return -ENODEV;
+ }
if (nvme_identify_ns(ns->ctrl, ns->ns_id, &id)) {
- dev_warn(ns->ctrl->dev, "%s: Identify failure nvme%dn%d\n",
- __func__, ns->ctrl->instance, ns->ns_id);
+ dev_warn(disk_to_dev(ns->disk), "%s: Identify failure\n",
+ __func__);
return -ENODEV;
}
if (id->ncap == 0) {
@@@ -839,24 -874,8 +883,25 @@@ int nvme_shutdown_ctrl(struct nvme_ctr
return ret;
}
+ EXPORT_SYMBOL_GPL(nvme_shutdown_ctrl);
+static void nvme_set_queue_limits(struct nvme_ctrl *ctrl,
+ struct request_queue *q)
+{
+ if (ctrl->max_hw_sectors) {
+ u32 max_segments =
+ (ctrl->max_hw_sectors / (ctrl->page_size >> 9)) + 1;
+
+ blk_queue_max_hw_sectors(q, ctrl->max_hw_sectors);
+ blk_queue_max_segments(q, min_t(u32, max_segments, USHRT_MAX));
+ }
+ if (ctrl->stripe_size)
+ blk_queue_chunk_sectors(q, ctrl->stripe_size >> 9);
+ if (ctrl->vwc & NVME_CTRL_VWC_PRESENT)
+ blk_queue_flush(q, REQ_FLUSH | REQ_FUA);
+ blk_queue_virt_boundary(q, ctrl->page_size - 1);
+}
+
/*
* Initialize the cached copies of the Identify data and various controller
* register in our nvme_ctrl structure. This should be called as soon as
@@@ -1313,9 -1360,12 +1372,10 @@@ void nvme_remove_namespaces(struct nvme
{
struct nvme_ns *ns, *next;
- mutex_lock(&ctrl->namespaces_mutex);
list_for_each_entry_safe(ns, next, &ctrl->namespaces, list)
nvme_ns_remove(ns);
- mutex_unlock(&ctrl->namespaces_mutex);
}
+ EXPORT_SYMBOL_GPL(nvme_remove_namespaces);
static DEFINE_IDA(nvme_instance_ida);
@@@ -1401,8 -1452,6 +1463,7 @@@ int nvme_init_ctrl(struct nvme_ctrl *ct
goto out_release_instance;
}
get_device(ctrl->device);
- dev_set_drvdata(ctrl->device, ctrl);
+ ida_init(&ctrl->ns_ida);
spin_lock(&dev_list_lock);
list_add_tail(&ctrl->node, &nvme_ctrl_list);
@@@ -1414,39 -1463,8 +1475,40 @@@ out_release_instance
out:
return ret;
}
+ EXPORT_SYMBOL_GPL(nvme_init_ctrl);
+/**
+ * nvme_kill_queues(): Ends all namespace queues
+ * @ctrl: the dead controller that needs to end
+ *
+ * Call this function when the driver determines it is unable to get the
+ * controller in a state capable of servicing IO.
+ */
+void nvme_kill_queues(struct nvme_ctrl *ctrl)
+{
+ struct nvme_ns *ns;
+
+ mutex_lock(&ctrl->namespaces_mutex);
+ list_for_each_entry(ns, &ctrl->namespaces, list) {
+ if (!kref_get_unless_zero(&ns->kref))
+ continue;
+
+ /*
+ * Revalidating a dead namespace sets capacity to 0. This will
+ * end buffered writers dirtying pages that can't be synced.
+ */
+ if (!test_and_set_bit(NVME_NS_DEAD, &ns->flags))
+ revalidate_disk(ns->disk);
+
+ blk_set_queue_dying(ns->queue);
+ blk_mq_abort_requeue_list(ns->queue);
+ blk_mq_start_stopped_hw_queues(ns->queue, true);
+
+ nvme_put_ns(ns);
+ }
+ mutex_unlock(&ctrl->namespaces_mutex);
+}
+
void nvme_stop_queues(struct nvme_ctrl *ctrl)
{
struct nvme_ns *ns;
^ permalink raw reply
* linux-next: build failure after merge of the block tree
From: Stephen Rothwell @ 2016-03-07 3:29 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel, Ming Lin, Keith Busch
Hi Jens,
After merging the block tree, today's linux-next build (x86_64
allmodconfig) failed like this:
ERROR: "nvme_kill_queues" [drivers/nvme/host/nvme.ko] undefined!
Caused by commit
576d55d62566 ("nvme: split pci module out of core module")
interacting with commit
69d9a99c258e ("NVMe: Move error handling to failed reset handler")
from Linus' tree.
I applied the merge fix patch below. Maybe you should do a back merge
of Linus' tree and fix this up as well as the conflicts.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Mar 2016 14:24:19 +1100
Subject: [PATCH] nvme: fix up for "split pci module out of core module"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/nvme/host/core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index db47bbda06b3..e2d11d623e33 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1508,6 +1508,7 @@ void nvme_kill_queues(struct nvme_ctrl *ctrl)
}
mutex_unlock(&ctrl->namespaces_mutex);
}
+EXPORT_SYMBOL_GPL(nvme_kill_queues);
void nvme_stop_queues(struct nvme_ctrl *ctrl)
{
--
2.7.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: manual merge of the watchdog tree with the arm-soc tree
From: Stephen Rothwell @ 2016-03-07 4:04 UTC (permalink / raw)
To: Wim Van Sebroeck, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Fu Wei, Guenter Roeck, Andre Przywara,
Sudeep Holla
Hi Wim,
Today's linux-next merge of the watchdog tree got a conflict in:
arch/arm64/boot/dts/arm/foundation-v8.dts
between commit:
d11a89796678 ("arm64: dts: split Foundation model dts to put the GIC separately")
from the arm-soc tree and commit:
fe3a97e8ed02 ("ARM64: add SBSA Generic Watchdog device node in foundation-v8.dts")
from the watchdog tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/boot/dts/arm/foundation-v8.dts
index 71168077312d,66cb9aaa9135..000000000000
--- a/arch/arm64/boot/dts/arm/foundation-v8.dts
+++ b/arch/arm64/boot/dts/arm/foundation-v8.dts
@@@ -18,4 -83,165 +18,11 @@@
<0x0 0x2c006000 0 0x2000>;
interrupts = <1 9 0xf04>;
};
-
- timer {
- compatible = "arm,armv8-timer";
- interrupts = <1 13 0xf08>,
- <1 14 0xf08>,
- <1 11 0xf08>,
- <1 10 0xf08>;
- clock-frequency = <100000000>;
- };
-
- pmu {
- compatible = "arm,armv8-pmuv3";
- interrupts = <0 60 4>,
- <0 61 4>,
- <0 62 4>,
- <0 63 4>;
- };
-
- smb {
- compatible = "arm,vexpress,v2m-p1", "simple-bus";
- arm,v2m-memory-map = "rs1";
- #address-cells = <2>; /* SMB chipselect number and offset */
- #size-cells = <1>;
-
- ranges = <0 0 0 0x08000000 0x04000000>,
- <1 0 0 0x14000000 0x04000000>,
- <2 0 0 0x18000000 0x04000000>,
- <3 0 0 0x1c000000 0x04000000>,
- <4 0 0 0x0c000000 0x04000000>,
- <5 0 0 0x10000000 0x04000000>;
-
- #interrupt-cells = <1>;
- interrupt-map-mask = <0 0 63>;
- interrupt-map = <0 0 0 &gic 0 0 4>,
- <0 0 1 &gic 0 1 4>,
- <0 0 2 &gic 0 2 4>,
- <0 0 3 &gic 0 3 4>,
- <0 0 4 &gic 0 4 4>,
- <0 0 5 &gic 0 5 4>,
- <0 0 6 &gic 0 6 4>,
- <0 0 7 &gic 0 7 4>,
- <0 0 8 &gic 0 8 4>,
- <0 0 9 &gic 0 9 4>,
- <0 0 10 &gic 0 10 4>,
- <0 0 11 &gic 0 11 4>,
- <0 0 12 &gic 0 12 4>,
- <0 0 13 &gic 0 13 4>,
- <0 0 14 &gic 0 14 4>,
- <0 0 15 &gic 0 15 4>,
- <0 0 16 &gic 0 16 4>,
- <0 0 17 &gic 0 17 4>,
- <0 0 18 &gic 0 18 4>,
- <0 0 19 &gic 0 19 4>,
- <0 0 20 &gic 0 20 4>,
- <0 0 21 &gic 0 21 4>,
- <0 0 22 &gic 0 22 4>,
- <0 0 23 &gic 0 23 4>,
- <0 0 24 &gic 0 24 4>,
- <0 0 25 &gic 0 25 4>,
- <0 0 26 &gic 0 26 4>,
- <0 0 27 &gic 0 27 4>,
- <0 0 28 &gic 0 28 4>,
- <0 0 29 &gic 0 29 4>,
- <0 0 30 &gic 0 30 4>,
- <0 0 31 &gic 0 31 4>,
- <0 0 32 &gic 0 32 4>,
- <0 0 33 &gic 0 33 4>,
- <0 0 34 &gic 0 34 4>,
- <0 0 35 &gic 0 35 4>,
- <0 0 36 &gic 0 36 4>,
- <0 0 37 &gic 0 37 4>,
- <0 0 38 &gic 0 38 4>,
- <0 0 39 &gic 0 39 4>,
- <0 0 40 &gic 0 40 4>,
- <0 0 41 &gic 0 41 4>,
- <0 0 42 &gic 0 42 4>;
-
- ethernet@2,02000000 {
- compatible = "smsc,lan91c111";
- reg = <2 0x02000000 0x10000>;
- interrupts = <15>;
- };
-
- v2m_clk24mhz: clk24mhz {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <24000000>;
- clock-output-names = "v2m:clk24mhz";
- };
-
- v2m_refclk1mhz: refclk1mhz {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <1000000>;
- clock-output-names = "v2m:refclk1mhz";
- };
-
- v2m_refclk32khz: refclk32khz {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <32768>;
- clock-output-names = "v2m:refclk32khz";
- };
-
- iofpga@3,00000000 {
- compatible = "arm,amba-bus", "simple-bus";
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0 3 0 0x200000>;
-
- v2m_sysreg: sysreg@010000 {
- compatible = "arm,vexpress-sysreg";
- reg = <0x010000 0x1000>;
- };
-
- v2m_serial0: uart@090000 {
- compatible = "arm,pl011", "arm,primecell";
- reg = <0x090000 0x1000>;
- interrupts = <5>;
- clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
- clock-names = "uartclk", "apb_pclk";
- };
-
- v2m_serial1: uart@0a0000 {
- compatible = "arm,pl011", "arm,primecell";
- reg = <0x0a0000 0x1000>;
- interrupts = <6>;
- clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
- clock-names = "uartclk", "apb_pclk";
- };
-
- v2m_serial2: uart@0b0000 {
- compatible = "arm,pl011", "arm,primecell";
- reg = <0x0b0000 0x1000>;
- interrupts = <7>;
- clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
- clock-names = "uartclk", "apb_pclk";
- };
-
- v2m_serial3: uart@0c0000 {
- compatible = "arm,pl011", "arm,primecell";
- reg = <0x0c0000 0x1000>;
- interrupts = <8>;
- clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
- clock-names = "uartclk", "apb_pclk";
- };
-
- virtio_block@0130000 {
- compatible = "virtio,mmio";
- reg = <0x130000 0x200>;
- interrupts = <42>;
- };
- };
- };
+ watchdog@2a440000 {
+ compatible = "arm,sbsa-gwdt";
+ reg = <0x0 0x2a440000 0 0x1000>,
+ <0x0 0x2a450000 0 0x1000>;
+ interrupts = <0 27 4>;
+ timeout-sec = <30>;
+ };
};
^ permalink raw reply
* Re: linux-next: manual merge of the watchdog tree with the arm-soc tree
From: Olof Johansson @ 2016-03-07 5:41 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Wim Van Sebroeck, Arnd Bergmann,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Fu Wei, Guenter Roeck,
Andre Przywara, Sudeep Holla
In-Reply-To: <20160307150402.191ba735@canb.auug.org.au>
Hi Wim,
It's much easier for us if all DTS changes go in through the arm-soc
trees, to avoid these kind of conflicts. Is this on a branch where you
can easily drop it and we pick it up instead, or is it on a now-stable
branch?
-Olof
On Sun, Mar 6, 2016 at 8:04 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Wim,
>
> Today's linux-next merge of the watchdog tree got a conflict in:
>
> arch/arm64/boot/dts/arm/foundation-v8.dts
>
> between commit:
>
> d11a89796678 ("arm64: dts: split Foundation model dts to put the GIC separately")
>
> from the arm-soc tree and commit:
>
> fe3a97e8ed02 ("ARM64: add SBSA Generic Watchdog device node in foundation-v8.dts")
>
> from the watchdog tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm64/boot/dts/arm/foundation-v8.dts
> index 71168077312d,66cb9aaa9135..000000000000
> --- a/arch/arm64/boot/dts/arm/foundation-v8.dts
> +++ b/arch/arm64/boot/dts/arm/foundation-v8.dts
> @@@ -18,4 -83,165 +18,11 @@@
> <0x0 0x2c006000 0 0x2000>;
> interrupts = <1 9 0xf04>;
> };
> -
> - timer {
> - compatible = "arm,armv8-timer";
> - interrupts = <1 13 0xf08>,
> - <1 14 0xf08>,
> - <1 11 0xf08>,
> - <1 10 0xf08>;
> - clock-frequency = <100000000>;
> - };
> -
> - pmu {
> - compatible = "arm,armv8-pmuv3";
> - interrupts = <0 60 4>,
> - <0 61 4>,
> - <0 62 4>,
> - <0 63 4>;
> - };
> -
> - smb {
> - compatible = "arm,vexpress,v2m-p1", "simple-bus";
> - arm,v2m-memory-map = "rs1";
> - #address-cells = <2>; /* SMB chipselect number and offset */
> - #size-cells = <1>;
> -
> - ranges = <0 0 0 0x08000000 0x04000000>,
> - <1 0 0 0x14000000 0x04000000>,
> - <2 0 0 0x18000000 0x04000000>,
> - <3 0 0 0x1c000000 0x04000000>,
> - <4 0 0 0x0c000000 0x04000000>,
> - <5 0 0 0x10000000 0x04000000>;
> -
> - #interrupt-cells = <1>;
> - interrupt-map-mask = <0 0 63>;
> - interrupt-map = <0 0 0 &gic 0 0 4>,
> - <0 0 1 &gic 0 1 4>,
> - <0 0 2 &gic 0 2 4>,
> - <0 0 3 &gic 0 3 4>,
> - <0 0 4 &gic 0 4 4>,
> - <0 0 5 &gic 0 5 4>,
> - <0 0 6 &gic 0 6 4>,
> - <0 0 7 &gic 0 7 4>,
> - <0 0 8 &gic 0 8 4>,
> - <0 0 9 &gic 0 9 4>,
> - <0 0 10 &gic 0 10 4>,
> - <0 0 11 &gic 0 11 4>,
> - <0 0 12 &gic 0 12 4>,
> - <0 0 13 &gic 0 13 4>,
> - <0 0 14 &gic 0 14 4>,
> - <0 0 15 &gic 0 15 4>,
> - <0 0 16 &gic 0 16 4>,
> - <0 0 17 &gic 0 17 4>,
> - <0 0 18 &gic 0 18 4>,
> - <0 0 19 &gic 0 19 4>,
> - <0 0 20 &gic 0 20 4>,
> - <0 0 21 &gic 0 21 4>,
> - <0 0 22 &gic 0 22 4>,
> - <0 0 23 &gic 0 23 4>,
> - <0 0 24 &gic 0 24 4>,
> - <0 0 25 &gic 0 25 4>,
> - <0 0 26 &gic 0 26 4>,
> - <0 0 27 &gic 0 27 4>,
> - <0 0 28 &gic 0 28 4>,
> - <0 0 29 &gic 0 29 4>,
> - <0 0 30 &gic 0 30 4>,
> - <0 0 31 &gic 0 31 4>,
> - <0 0 32 &gic 0 32 4>,
> - <0 0 33 &gic 0 33 4>,
> - <0 0 34 &gic 0 34 4>,
> - <0 0 35 &gic 0 35 4>,
> - <0 0 36 &gic 0 36 4>,
> - <0 0 37 &gic 0 37 4>,
> - <0 0 38 &gic 0 38 4>,
> - <0 0 39 &gic 0 39 4>,
> - <0 0 40 &gic 0 40 4>,
> - <0 0 41 &gic 0 41 4>,
> - <0 0 42 &gic 0 42 4>;
> -
> - ethernet@2,02000000 {
> - compatible = "smsc,lan91c111";
> - reg = <2 0x02000000 0x10000>;
> - interrupts = <15>;
> - };
> -
> - v2m_clk24mhz: clk24mhz {
> - compatible = "fixed-clock";
> - #clock-cells = <0>;
> - clock-frequency = <24000000>;
> - clock-output-names = "v2m:clk24mhz";
> - };
> -
> - v2m_refclk1mhz: refclk1mhz {
> - compatible = "fixed-clock";
> - #clock-cells = <0>;
> - clock-frequency = <1000000>;
> - clock-output-names = "v2m:refclk1mhz";
> - };
> -
> - v2m_refclk32khz: refclk32khz {
> - compatible = "fixed-clock";
> - #clock-cells = <0>;
> - clock-frequency = <32768>;
> - clock-output-names = "v2m:refclk32khz";
> - };
> -
> - iofpga@3,00000000 {
> - compatible = "arm,amba-bus", "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <1>;
> - ranges = <0 3 0 0x200000>;
> -
> - v2m_sysreg: sysreg@010000 {
> - compatible = "arm,vexpress-sysreg";
> - reg = <0x010000 0x1000>;
> - };
> -
> - v2m_serial0: uart@090000 {
> - compatible = "arm,pl011", "arm,primecell";
> - reg = <0x090000 0x1000>;
> - interrupts = <5>;
> - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> - clock-names = "uartclk", "apb_pclk";
> - };
> -
> - v2m_serial1: uart@0a0000 {
> - compatible = "arm,pl011", "arm,primecell";
> - reg = <0x0a0000 0x1000>;
> - interrupts = <6>;
> - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> - clock-names = "uartclk", "apb_pclk";
> - };
> -
> - v2m_serial2: uart@0b0000 {
> - compatible = "arm,pl011", "arm,primecell";
> - reg = <0x0b0000 0x1000>;
> - interrupts = <7>;
> - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> - clock-names = "uartclk", "apb_pclk";
> - };
> -
> - v2m_serial3: uart@0c0000 {
> - compatible = "arm,pl011", "arm,primecell";
> - reg = <0x0c0000 0x1000>;
> - interrupts = <8>;
> - clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
> - clock-names = "uartclk", "apb_pclk";
> - };
> -
> - virtio_block@0130000 {
> - compatible = "virtio,mmio";
> - reg = <0x130000 0x200>;
> - interrupts = <42>;
> - };
> - };
> - };
> + watchdog@2a440000 {
> + compatible = "arm,sbsa-gwdt";
> + reg = <0x0 0x2a440000 0 0x1000>,
> + <0x0 0x2a450000 0 0x1000>;
> + interrupts = <0 27 4>;
> + timeout-sec = <30>;
> + };
> };
^ permalink raw reply
* linux-next: build warnings after merge of the dt-rh tree
From: Stephen Rothwell @ 2016-03-07 7:57 UTC (permalink / raw)
To: Rob Herring; +Cc: linux-next, linux-kernel
Hi Rob,
After merging the dt-rh tree, today's linux-next build (powerpc allyesconfig)
produced these warnings:
Warning (unit_address_vs_reg): Node /testcase-data/interrupts/interrupts-extended0 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/test-unittest100 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/test-unittest101 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/test-unittest0 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/test-unittest1 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/test-unittest2 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/test-unittest3 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/test-unittest5 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/test-unittest6 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/test-unittest7 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/test-unittest8 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/i2c-test-bus has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest12 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest13 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest14 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest14/i2c@0/test-mux-dev has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay0/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay1/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay2/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay3/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay4/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay4/fragment@0/__overlay__/test-unittest4 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay5/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay6/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay7/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay8/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay9/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay10/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay10/fragment@0/__overlay__/test-unittest10 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay10/fragment@0/__overlay__/test-unittest10/test-unittest101 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay11/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay11/fragment@0/__overlay__/test-unittest11 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay11/fragment@0/__overlay__/test-unittest11/test-unittest111 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay12/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay13/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay15/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /testcase-data/overlay15/fragment@0/__overlay__/test-unittest15 has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /testcase-data/overlay15/fragment@0/__overlay__/test-unittest15/i2c@0/test-mux-dev has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): Node /__local_fixups__/testcase-data/overlay2/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /__local_fixups__/testcase-data/overlay3/fragment@0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /__local_fixups__/testcase-data/overlay4/fragment@0 has a unit name, but no reg property
Introduced by commit
fa38a82096a1 ("scripts/dtc: Update to upstream version 53bf130b1cdd")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the akpm-current tree with the drm tree
From: Stephen Rothwell @ 2016-03-07 8:14 UTC (permalink / raw)
To: Andrew Morton, Dave Airlie
Cc: linux-next, linux-kernel, Luis R. Rodriguez, Laurent Pinchart,
Tomi Valkeinen
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/gpu/drm/omapdrm/omap_gem.c
between commit:
cdb0381d2f19 ("drm/omap: gem: Clean up GEM objects memory flags")
(and others following)
from the drm tree and commit:
c45472f906f4 ("dma-mapping: rename dma_*_writecombine() to dma_*_wc()")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/omapdrm/omap_gem.c
index cc36a8dc9bd4,359b0d7e8ef7..000000000000
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@@ -1305,23 -1324,22 +1305,23 @@@ void omap_gem_free_object(struct drm_ge
*/
WARN_ON(omap_obj->paddr_cnt > 0);
- /* don't free externally allocated backing memory */
- if (!(omap_obj->flags & OMAP_BO_EXT_MEM)) {
- if (omap_obj->pages)
+ if (omap_obj->pages) {
+ if (omap_obj->flags & OMAP_BO_MEM_DMABUF)
+ kfree(omap_obj->pages);
+ else
omap_gem_detach_pages(obj);
+ }
- if (!is_shmem(obj)) {
- dma_free_wc(dev->dev, obj->size, omap_obj->vaddr,
- omap_obj->paddr);
- } else if (omap_obj->vaddr) {
- vunmap(omap_obj->vaddr);
- }
+ if (omap_obj->flags & OMAP_BO_MEM_DMA_API) {
- dma_free_writecombine(dev->dev, obj->size,
++ dma_free_wc(dev->dev, obj->size,
+ omap_obj->vaddr, omap_obj->paddr);
+ } else if (omap_obj->vaddr) {
+ vunmap(omap_obj->vaddr);
+ } else if (obj->import_attach) {
+ drm_prime_gem_destroy(obj, omap_obj->sgt);
}
- /* don't free externally allocated syncobj */
- if (!(omap_obj->flags & OMAP_BO_EXT_SYNC))
- kfree(omap_obj->sync);
+ kfree(omap_obj->sync);
drm_gem_object_release(obj);
@@@ -1410,25 -1428,10 +1410,25 @@@ struct drm_gem_object *omap_gem_new(str
mapping_set_gfp_mask(mapping, GFP_USER | __GFP_DMA32);
}
+ /* Allocate memory if needed. */
+ if (flags & OMAP_BO_MEM_DMA_API) {
- omap_obj->vaddr = dma_alloc_writecombine(dev->dev, size,
++ omap_obj->vaddr = dma_alloc_wc(dev->dev, size,
+ &omap_obj->paddr,
+ GFP_KERNEL);
+ if (!omap_obj->vaddr)
+ goto err_release;
+ }
+
+ spin_lock(&priv->list_lock);
+ list_add(&omap_obj->mm_list, &priv->obj_list);
+ spin_unlock(&priv->list_lock);
+
return obj;
-fail:
- omap_gem_free_object(obj);
+err_release:
+ drm_gem_object_release(obj);
+err_free:
+ kfree(omap_obj);
return NULL;
}
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox