]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/log
mirror_ubuntu-artful-kernel.git
8 years agopowerpc/powernv: Fix update of NVLink DMA mask
Alistair Popple [Fri, 8 Jan 2016 00:35:09 +0000 (11:35 +1100)]
powerpc/powernv: Fix update of NVLink DMA mask

BugLink: http://bugs.launchpad.net/bugs/1522415
The emulated NVLink PCI devices share the same IODA2 TCE tables but only
support a single TVT (instead of the normal two for PCI devices). This
requires the kernel to manually replace windows with either the bypass
or non-bypass window depending on what the driver has requested.

Unfortunately an incorrect optimisation was made in
pnv_pci_ioda_dma_set_mask() which caused updating of some NPU device PEs
to be skipped in certain configurations due to an incorrect assumption
that a NULL peer PE in the array indicated there were no more peers
present. This patch fixes the problem by ensuring all peer PEs are
updated.

Fixes: 5d2aa710e697 ("powerpc/powernv: Add support for Nvlink NPUs")
Signed-off-by: Alistair Popple <alistair@popple.id.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
(cherry picked from commit 419dbd5e1ff0e45a6e1d28c1f7b74d121d2a56e7)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Start new release
Tim Gardner [Tue, 19 Jan 2016 12:49:58 +0000 (05:49 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agopowerpc/powernv: Add support for Nvlink NPUs
Alistair Popple [Thu, 17 Dec 2015 02:43:13 +0000 (13:43 +1100)]
powerpc/powernv: Add support for Nvlink NPUs

BugLink: http://bugs.launchpad.net/bugs/1522415
NVLink is a high speed interconnect that is used in conjunction with a
PCI-E connection to create an interface between CPU and GPU that
provides very high data bandwidth. A PCI-E connection to a GPU is used
as the control path to initiate and report status of large data
transfers sent via the NVLink.

On IBM Power systems the NVLink processing unit (NPU) is similar to
the existing PHB3. This patch adds support for a new NPU PHB type. DMA
operations on the NPU are not supported as this patch sets the TCE
translation tables to be the same as the related GPU PCIe device for
each NVLink. Therefore all DMA operations are setup and controlled via
the PCIe device.

EEH is not presently supported for the NPU devices, although it may be
added in future.

Signed-off-by: Alistair Popple <alistair@popple.id.au>
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
(cherry picked from commit 5d2aa710e697244f5504125e4aa6e2cfcf6c4791)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Ubuntu-4.4.0-0.12
Tim Gardner [Fri, 15 Jan 2016 22:04:37 +0000 (15:04 -0700)]
UBUNTU: Ubuntu-4.4.0-0.12

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] Install spl/zfs under the kernel modules directory
Tim Gardner [Fri, 15 Jan 2016 20:43:32 +0000 (13:43 -0700)]
UBUNTU: [Config] Install spl/zfs under the kernel modules directory

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] CONFIG_KVM=y for s390x
Tim Gardner [Fri, 15 Jan 2016 15:51:09 +0000 (08:51 -0700)]
UBUNTU: [Config] CONFIG_KVM=y for s390x

BugLink: http://bugs.launchpad.net/bugs/1532886
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] Add DRM ast driver to udeb installer image
Tim Gardner [Thu, 14 Jan 2016 15:05:30 +0000 (08:05 -0700)]
UBUNTU: [Config] Add DRM ast driver to udeb installer image

BugLink: http://bugs.launchpad.net/bugs/1514711
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoDriver for IBM System i/p VNIC protocol
Thomas Falcon [Mon, 21 Dec 2015 17:26:06 +0000 (11:26 -0600)]
Driver for IBM System i/p VNIC protocol

BugLink: http://bugs.launchpad.net/bugs/1532303
This is a new device driver for a high performance SR-IOV assisted virtual
network for IBM System p and IBM System i systems.  The SR-IOV VF will be
attached to the VIOS partition and mapped to the Linux client via the
hypervisor's VNIC protocol that this driver implements.

This driver is able to perform basic tx and rx, new features
and improvements will be added as they are being developed and tested.

Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: John Allen <jallen@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 032c5e82847a2214c3196a90f0aeba0ce252de58)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] CONFIG_IBMVNIC=m
Tim Gardner [Wed, 13 Jan 2016 19:10:57 +0000 (12:10 -0700)]
UBUNTU: [Config] CONFIG_IBMVNIC=m

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] scsi_dh morphed into 4 modules
Tim Gardner [Wed, 13 Jan 2016 16:54:03 +0000 (09:54 -0700)]
UBUNTU: [Config] scsi_dh morphed into 4 modules

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] nvme.ko moved to drivers/nvme/host
Tim Gardner [Wed, 13 Jan 2016 16:22:07 +0000 (09:22 -0700)]
UBUNTU: [Config] nvme.ko moved to drivers/nvme/host

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoEDAC, sb_edac: Add Knights Landing (Xeon Phi gen 2) support
Jim Snow [Thu, 3 Dec 2015 09:48:54 +0000 (10:48 +0100)]
EDAC, sb_edac: Add Knights Landing (Xeon Phi gen 2) support

BugLink: http://bugs.launchpad.net/bugs/1519631
Knights Landing is the next generation architecture for HPC market.

KNL introduces concept of a tile and CHA - Cache/Home Agent for memory
accesses.

Some things are fixed in KNL:
() There's single DIMM slot per channel
() There's 2 memory controllers with 3 channels each, however,
   from EDAC standpoint, it is presented as single memory controller
   with 6 channels. In order to represent 2 MCs w/ 3 CH, it would
   require major redesign of EDAC core driver.

Basically, two functionalities are added/extended:
() during driver initialization KNL topology is being recognized, i.e.
   which channels are populated with what DIMM sizes
   (knl_get_dimm_capacity function)
() handle MCE errors - channel swizzling

Reviewed-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Jim Snow <jim.m.snow@intel.com>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: lukasz.anaczkowski@intel.com
Link: http://lkml.kernel.org/r/1449136134-23706-5-git-send-email-hubert.chrzaniuk@intel.com
[ Rebase to 4.4-rc3. ]
Signed-off-by: Hubert Chrzaniuk <hubert.chrzaniuk@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
(cherry picked from commit d0cdf9003140e9b40d2488aaee2838babe7e212c)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoEDAC, sb_edac: Add support for duplicate device IDs
Jim Snow [Thu, 3 Dec 2015 09:48:53 +0000 (10:48 +0100)]
EDAC, sb_edac: Add support for duplicate device IDs

BugLink: http://bugs.launchpad.net/bugs/1519631
Add options to sbridge_get_all_devices() to allow for duplicate device
IDs and devices that are scattered across mulitple PCI buses.

Signed-off-by: Jim Snow <jim.m.snow@intel.com>
Acked-by: Tony Luck <tony.luck@intel.com>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: lukasz.anaczkowski@intel.com
Link: http://lkml.kernel.org/r/1449136134-23706-4-git-send-email-hubert.chrzaniuk@intel.com
[ Rebase to 4.4-rc3. ]
Signed-off-by: Hubert Chrzaniuk <hubert.chrzaniuk@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
(cherry picked from commit c1979ba254810a710bfdc982e3d417a4a7369c31)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoEDAC, sb_edac: Virtualize several hard-coded functions
Jim Snow [Thu, 3 Dec 2015 09:48:52 +0000 (10:48 +0100)]
EDAC, sb_edac: Virtualize several hard-coded functions

BugLink: http://bugs.launchpad.net/bugs/1519631
SAD limit, interleave mode and DRAM related functionalities are now
virtualized, so that overriding them is easier.

Signed-off-by: Jim Snow <jim.m.snow@intel.com>
Acked-by: Tony Luck <tony.luck@intel.com>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: lukasz.anaczkowski@intel.com
Link: http://lkml.kernel.org/r/1449136134-23706-3-git-send-email-hubert.chrzaniuk@intel.com
[ Rebase to 4.4-rc3. ]
Signed-off-by: Hubert Chrzaniuk <hubert.chrzaniuk@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
(cherry picked from commit c59f9c06bdbdaeff9da107d2fcec4f46e9b10825)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoEDAC: Add DDR4 flag
Jim Snow [Thu, 3 Dec 2015 09:48:51 +0000 (10:48 +0100)]
EDAC: Add DDR4 flag

BugLink: http://bugs.launchpad.net/bugs/1519631
Make EDAC aware of DDR4/RDDR4 mem types.

Signed-off-by: Jim Snow <jim.m.snow@intel.com>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: lukasz.anaczkowski@intel.com
Link: http://lkml.kernel.org/r/1449136134-23706-2-git-send-email-hubert.chrzaniuk@intel.com
[ Rebase to 4.4-rc3. ]
Signed-off-by: Hubert Chrzaniuk <hubert.chrzaniuk@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
(cherry picked from commit 255379ae9af8c04788c171fa050949ab2ac3f356)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoperf/x86/intel/uncore: Add Broadwell-EP uncore support
Kan Liang [Thu, 3 Dec 2015 21:00:11 +0000 (16:00 -0500)]
perf/x86/intel/uncore: Add Broadwell-EP uncore support

BugLink: http://bugs.launchpad.net/bugs/1524574
The uncore subsystem for Broadwell-EP is similar to Haswell-EP.
There are some differences in pci device IDs, box number and
constraints. This patch extends the Broadwell-DE codes to support
Broadwell-EP.

Signed-off-by: Kan Liang <kan.liang@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1449176411-9499-1-git-send-email-kan.liang@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
(cherry picked from commit d6980ef32570e2a26e05b1183788f4b70f1f27d0)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: SAUCE: AUFS
Tim Gardner [Tue, 12 Jan 2016 17:22:53 +0000 (10:22 -0700)]
UBUNTU: SAUCE: AUFS

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoRevert "UBUNTU: SAUCE: AUFS"
Tim Gardner [Tue, 12 Jan 2016 17:22:38 +0000 (10:22 -0700)]
Revert "UBUNTU: SAUCE: AUFS"

This reverts commit dc2781ca67ef072fff4494c4ca50acf901887cfb.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: SAUCE: (no-up) udp: properly support MSG_PEEK with truncated buffers
Eric Dumazet [Mon, 11 Jan 2016 22:01:05 +0000 (14:01 -0800)]
UBUNTU: SAUCE: (no-up) udp: properly support MSG_PEEK with truncated buffers

BugLink: http://bugs.launchpad.net/bugs/1527902
Backport of this upstream commit into stable kernels :
89c22d8c3b27 ("net: Fix skb csum races when peeking")
exposed a bug in udp stack vs MSG_PEEK support, when user provides
a buffer smaller than skb payload.

In this case,
skb_copy_and_csum_datagram_iovec(skb, sizeof(struct udphdr),
                                 msg->msg_iov);
returns -EFAULT.

This bug does not happen in upstream kernels since Al Viro did a great
job to replace this into :
skb_copy_and_csum_datagram_msg(skb, sizeof(struct udphdr), msg);
This variant is safe vs short buffers.

For the time being, instead reverting Herbert Xu patch and add back
skb->ip_summed invalid changes, simply store the result of
udp_lib_checksum_complete() so that we avoid computing the checksum a
second time, and avoid the problematic
skb_copy_and_csum_datagram_iovec() call.

This patch can be applied on recent kernels as it avoids a double
checksumming, then backported to stable kernels as a bug fix.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://patchwork.ozlabs.org/patch/561746/
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
8 years agoUBUNTU: [Config] CONFIG_VIRTIO_BLK=y, CONFIG_VIRTIO_NET=y for s390
Tim Gardner [Mon, 11 Jan 2016 19:16:22 +0000 (12:16 -0700)]
UBUNTU: [Config] CONFIG_VIRTIO_BLK=y, CONFIG_VIRTIO_NET=y for s390

BugLink: http://bugs.launchpad.net/bugs/1532886
Change these config settings to be consistent with all of the other
architectures.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: SAUCE: powerpc/eeh: Validate arch in eeh_add_device_early()
Guilherme G. Piccoli [Sun, 10 Jan 2016 02:18:21 +0000 (00:18 -0200)]
UBUNTU: SAUCE: powerpc/eeh: Validate arch in eeh_add_device_early()

BugLink: http://bugs.launchpad.net/bugs/1486180
Commit 89a51df5ab1d ("powerpc/eeh: Fix crash in eeh_add_device_early() on Cell")
added a check on function eeh_add_device_early(): since in Cell arch eeh_ops
is NULL, that code used to crash on Cell. The commit's approach was validate
if EEH was available by checking the result of function eeh_enabled().

Since the function eeh_add_device_early() is used to perform EEH
initialization in devices added later on the system, like in hotplug/DLPAR
scenarios, we might reach a case in which no PCI devices are present on boot
and so EEH is not initialized. Then, if a device is added via DLPAR for
example, eeh_add_device_early() fails because eeh_enabled() is false.

We can hit a kernel oops on pSeries arch if eeh_add_device_early() fails:
if we have no PCI devices on machine at boot time, and then we add a PCI device
via DLPAR operation, the function query_ddw() triggers the oops on NULL pointer
dereference in the line "cfg_addr = edev->config_addr;". It happens because
config_addr in edev is NULL, since the function eeh_add_device_early() was not
completed successfully.

This patch just changes the way the arch checking is done in function
eeh_add_device_early(): we use no more eeh_enabled(), but instead we check the
running architecture by using the macro machine_is(). If we are running on
pSeries or PowerNV, the EEH mechanism can be enabled; otherwise, we bail out
the function. This way, we don't enable EEH on Cell and we don't hit the oops
on DLPAR either.

Fixes: 89a51df5ab1d ("powerpc/eeh: Fix crash in eeh_add_device_early() on Cell")
Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Start new release
Tim Gardner [Mon, 11 Jan 2016 16:57:49 +0000 (09:57 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Ubuntu-4.4.0-0.11
Tim Gardner [Mon, 11 Jan 2016 16:45:03 +0000 (09:45 -0700)]
UBUNTU: Ubuntu-4.4.0-0.11

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] Fix bogus reconstruct script
Tim Gardner [Mon, 11 Jan 2016 16:44:02 +0000 (09:44 -0700)]
UBUNTU: [Config] Fix bogus reconstruct script

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Start new release
Tim Gardner [Mon, 11 Jan 2016 14:30:00 +0000 (07:30 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Ubuntu-4.4.0-0.10
Tim Gardner [Mon, 11 Jan 2016 13:28:17 +0000 (06:28 -0700)]
UBUNTU: Ubuntu-4.4.0-0.10

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Debian] Ignore spl/zfs symlinks
Tim Gardner [Mon, 11 Jan 2016 13:52:11 +0000 (06:52 -0700)]
UBUNTU: [Debian] Ignore spl/zfs symlinks

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: rebase to v4.4
Tim Gardner [Mon, 11 Jan 2016 12:23:23 +0000 (05:23 -0700)]
UBUNTU: rebase to v4.4

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: SAUCE: dmaengine: ioatdma: Squelch framesize warnings
Tim Gardner [Fri, 8 Jan 2016 21:37:45 +0000 (21:37 +0000)]
UBUNTU: SAUCE: dmaengine: ioatdma: Squelch framesize warnings

  CC [M]  drivers/dma/ioat/prep.o
drivers/dma/ioat/prep.c: In function 'ioat_prep_pqxor':
drivers/dma/ioat/prep.c:682:1: warning: the frame size of 1048 bytes is larger than 1024 bytes [-Wframe-larger-than=]
 }
 ^
drivers/dma/ioat/prep.c: In function 'ioat_prep_pqxor_val':
drivers/dma/ioat/prep.c:714:1: warning: the frame size of 1048 bytes is larger than 1024 bytes [-Wframe-larger-than=]
 }

gcc version 5.3.1 20151219 (Ubuntu 5.3.1-4ubuntu1)

Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Nicholas Mc Guire <der.herr@hofr.at>
Cc: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: SAUCE: radeon: r100: Silence 'may be used uninitialized' warnings
Tim Gardner [Thu, 7 Jan 2016 17:16:27 +0000 (10:16 -0700)]
UBUNTU: SAUCE: radeon: r100: Silence 'may be used uninitialized' warnings

  CC [M]  drivers/gpu/drm/radeon/r100.o
In file included from drivers/gpu/drm/radeon/radeon_mode.h:37:0,
                 from drivers/gpu/drm/radeon/radeon.h:80,
                 from drivers/gpu/drm/radeon/r100.c:33:
drivers/gpu/drm/radeon/r100.c: In function 'r100_bandwidth_update':
include/drm/drm_fixed.h:64:13: warning: 'crit_point_ff.full' may be used uninitialized in this function [-Wmaybe-uninitialized]
  u64 tmp = ((u64)A.full << 13);
             ^
drivers/gpu/drm/radeon/r100.c:3153:63: note: 'crit_point_ff.full' was declared here
  fixed20_12 peak_disp_bw, mem_bw, pix_clk, pix_clk2, temp_ff, crit_point_ff;
                                                               ^
drivers/gpu/drm/radeon/r100.c:3583:42: warning: 'disp_drain_rate.full' may be used uninitialized in this function [-Wmaybe-uninitialized]
     temp_ff.full = read_return_rate.full - disp_drain_rate.full;

gcc version 5.3.1 20151219 (Ubuntu 5.3.1-4ubuntu1)

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: SAUCE: (no-up) apparmor: Fix incompatible pointer type warnings
Tim Gardner [Thu, 7 Jan 2016 16:39:21 +0000 (09:39 -0700)]
UBUNTU: SAUCE: (no-up) apparmor: Fix incompatible pointer type warnings

  CC      security/apparmor/af_unix.o
In file included from ./arch/x86/include/asm/bug.h:35:0,
                 from include/linux/bug.h:4,
                 from include/linux/cpumask.h:12,
                 from ./arch/x86/include/asm/cpumask.h:4,
                 from ./arch/x86/include/asm/msr.h:10,
                 from ./arch/x86/include/asm/processor.h:20,
                 from ./arch/x86/include/asm/atomic.h:6,
                 from include/linux/atomic.h:4,
                 from include/linux/mutex.h:18,
                 from include/net/af_unix.h:6,
                 from security/apparmor/include/af_unix.h:15,
                 from security/apparmor/af_unix.c:16:
security/apparmor/af_unix.c: In function 'unix_fs_perm':
security/apparmor/af_unix.c:29:18: warning: passing argument 1 of 'unix_sk' from incompatible pointer type [-Wincompatible-pointer-types]
  AA_BUG(!UNIX_FS(u));
                  ^
include/asm-generic/bug.h:95:25: note: in definition of macro 'WARN'
  int __ret_warn_on = !!(condition);    \
                         ^
security/apparmor/include/apparmor.h:75:28: note: in expansion of macro 'AA_BUG_FMT'
 #define AA_BUG(X, args...) AA_BUG_FMT((X), "" args )
                            ^
security/apparmor/af_unix.c:29:2: note: in expansion of macro 'AA_BUG'
  AA_BUG(!UNIX_FS(u));
  ^
security/apparmor/include/af_unix.h:36:22: note: in expansion of macro 'UNIX_ANONYMOUS'
 #define UNIX_FS(U) (!UNIX_ANONYMOUS(U) && unix_sk(U)->addr->name->sun_path[0])
                      ^
security/apparmor/af_unix.c:29:10: note: in expansion of macro 'UNIX_FS'
  AA_BUG(!UNIX_FS(u));
          ^
In file included from security/apparmor/include/af_unix.h:15:0,
                 from security/apparmor/af_unix.c:16:
include/net/af_unix.h:68:33: note: expected 'const struct sock *' but argument is of type 'struct unix_sock *'
 static inline struct unix_sock *unix_sk(const struct sock *sk)
                                 ^
In file included from ./arch/x86/include/asm/bug.h:35:0,
                 from include/linux/bug.h:4,
                 from include/linux/cpumask.h:12,
                 from ./arch/x86/include/asm/cpumask.h:4,
                 from ./arch/x86/include/asm/msr.h:10,
                 from ./arch/x86/include/asm/processor.h:20,
                 from ./arch/x86/include/asm/atomic.h:6,
                 from include/linux/atomic.h:4,
                 from include/linux/mutex.h:18,
                 from include/net/af_unix.h:6,
                 from security/apparmor/include/af_unix.h:15,
                 from security/apparmor/af_unix.c:16:
security/apparmor/af_unix.c:29:18: warning: passing argument 1 of 'unix_sk' from incompatible pointer type [-Wincompatible-pointer-types]
  AA_BUG(!UNIX_FS(u));
                  ^
include/asm-generic/bug.h:95:25: note: in definition of macro 'WARN'
  int __ret_warn_on = !!(condition);    \
                         ^
security/apparmor/include/apparmor.h:75:28: note: in expansion of macro 'AA_BUG_FMT'
 #define AA_BUG(X, args...) AA_BUG_FMT((X), "" args )
                            ^
security/apparmor/af_unix.c:29:2: note: in expansion of macro 'AA_BUG'
  AA_BUG(!UNIX_FS(u));
  ^
security/apparmor/af_unix.c:29:10: note: in expansion of macro 'UNIX_FS'
  AA_BUG(!UNIX_FS(u));
          ^
In file included from security/apparmor/include/af_unix.h:15:0,
                 from security/apparmor/af_unix.c:16:
include/net/af_unix.h:68:33: note: expected 'const struct sock *' but argument is of type 'struct unix_sock *'
 static inline struct unix_sock *unix_sk(const struct sock *sk)
                                 ^
In file included from security/apparmor/af_unix.c:16:0:
security/apparmor/af_unix.c: In function 'aa_unix_peer_perm':
security/apparmor/af_unix.c:529:14: warning: passing argument 1 of 'unix_sk' from incompatible pointer type [-Wincompatible-pointer-types]
  if (UNIX_FS(peeru))
              ^
security/apparmor/include/af_unix.h:32:37: note: in definition of macro 'UNIX_ANONYMOUS'
 #define UNIX_ANONYMOUS(U) (!unix_sk(U)->addr)
                                     ^
security/apparmor/af_unix.c:529:6: note: in expansion of macro 'UNIX_FS'
  if (UNIX_FS(peeru))
      ^
In file included from security/apparmor/include/af_unix.h:15:0,
                 from security/apparmor/af_unix.c:16:
include/net/af_unix.h:68:33: note: expected 'const struct sock *' but argument is of type 'struct unix_sock *'
 static inline struct unix_sock *unix_sk(const struct sock *sk)
                                 ^
In file included from security/apparmor/af_unix.c:16:0:
security/apparmor/af_unix.c:529:14: warning: passing argument 1 of 'unix_sk' from incompatible pointer type [-Wincompatible-pointer-types]
  if (UNIX_FS(peeru))
              ^
security/apparmor/include/af_unix.h:36:51: note: in definition of macro 'UNIX_FS'
 #define UNIX_FS(U) (!UNIX_ANONYMOUS(U) && unix_sk(U)->addr->name->sun_path[0])
                                                   ^
In file included from security/apparmor/include/af_unix.h:15:0,
                 from security/apparmor/af_unix.c:16:
include/net/af_unix.h:68:33: note: expected 'const struct sock *' but argument is of type 'struct unix_sock *'
 static inline struct unix_sock *unix_sk(const struct sock *sk)
                                 ^
In file included from security/apparmor/af_unix.c:16:0:
security/apparmor/af_unix.c:531:19: warning: passing argument 1 of 'unix_sk' from incompatible pointer type [-Wincompatible-pointer-types]
  else if (UNIX_FS(u))
                   ^
security/apparmor/include/af_unix.h:32:37: note: in definition of macro 'UNIX_ANONYMOUS'
 #define UNIX_ANONYMOUS(U) (!unix_sk(U)->addr)
                                     ^
security/apparmor/af_unix.c:531:11: note: in expansion of macro 'UNIX_FS'
  else if (UNIX_FS(u))
           ^
In file included from security/apparmor/include/af_unix.h:15:0,
                 from security/apparmor/af_unix.c:16:
include/net/af_unix.h:68:33: note: expected 'const struct sock *' but argument is of type 'struct unix_sock *'
 static inline struct unix_sock *unix_sk(const struct sock *sk)
                                 ^
In file included from security/apparmor/af_unix.c:16:0:
security/apparmor/af_unix.c:531:19: warning: passing argument 1 of 'unix_sk' from incompatible pointer type [-Wincompatible-pointer-types]
  else if (UNIX_FS(u))
                   ^
security/apparmor/include/af_unix.h:36:51: note: in definition of macro 'UNIX_FS'
 #define UNIX_FS(U) (!UNIX_ANONYMOUS(U) && unix_sk(U)->addr->name->sun_path[0])
                                                   ^
In file included from security/apparmor/include/af_unix.h:15:0,
                 from security/apparmor/af_unix.c:16:
include/net/af_unix.h:68:33: note: expected 'const struct sock *' but argument is of type 'struct unix_sock *'
 static inline struct unix_sock *unix_sk(const struct sock *sk)
                                 ^

Cc: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: SAUCE: add a sysctl to disable unprivileged user namespace unsharing
Serge Hallyn [Tue, 5 Jan 2016 20:12:21 +0000 (20:12 +0000)]
UBUNTU: SAUCE: add a sysctl to disable unprivileged user namespace unsharing

It is turned on by default, but can be turned off if admins prefer or,
more importantly, if a security vulnerability is found.

The intent is to use this as mitigation so long as Ubuntu is on the
cutting edge of enablement for things like unprivileged filesystem
mounting.

(This patch is tweaked from the one currently still in Debian sid, which
in turn came from the patch we had in saucy)

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
[bwh: Remove unneeded binary sysctl bits]
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] CONFIG_BLK_DEV_LOOP=y for s390x
Tim Gardner [Wed, 16 Dec 2015 21:12:07 +0000 (14:12 -0700)]
UBUNTU: [Config] CONFIG_BLK_DEV_LOOP=y for s390x

BugLink: http://bugs.launchpad.net/bugs/1526869
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] CONFIG_ZONE_DEVICE=y for amd64
Tim Gardner [Tue, 5 Jan 2016 14:35:27 +0000 (07:35 -0700)]
UBUNTU: [Config] CONFIG_ZONE_DEVICE=y for amd64

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: SAUCE: crypto: nx-842 - Mask XERS0 bit in return value
Haren Myneni [Sun, 13 Dec 2015 11:30:41 +0000 (03:30 -0800)]
UBUNTU: SAUCE: crypto: nx-842 - Mask XERS0 bit in return value

BugLink: http://bugs.launchpad.net/bugs/1529666
NX842 coprocessor sets 3rd bit in CR register with XER[S0] which is
nothing to do with NX request. Since this bit can be set with other
valuable return status, mast this bit.

One of other bits (INITIATED, BUSY or REJECTED) will be returned for
any given NX request.

Signed-off-by: Haren Myneni <haren@us.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from linux-next commit 6333ed8f26cf77311088d2e2b7cf16d8480bcbb2)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Start new release
Tim Gardner [Tue, 5 Jan 2016 00:44:35 +0000 (17:44 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Ubuntu-4.4.0-0.9
Tim Gardner [Mon, 4 Jan 2016 02:21:48 +0000 (19:21 -0700)]
UBUNTU: Ubuntu-4.4.0-0.9

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: rebase to v4.4-rc8
Tim Gardner [Mon, 4 Jan 2016 02:11:07 +0000 (19:11 -0700)]
UBUNTU: rebase to v4.4-rc8

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Start new release
Tim Gardner [Mon, 4 Jan 2016 01:51:41 +0000 (18:51 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Ubuntu-4.4.0-0.8
Tim Gardner [Tue, 29 Dec 2015 13:14:14 +0000 (06:14 -0700)]
UBUNTU: Ubuntu-4.4.0-0.8

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: rebase to v4.4-rc7
Tim Gardner [Mon, 28 Dec 2015 23:18:55 +0000 (16:18 -0700)]
UBUNTU: rebase to v4.4-rc7

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Start new release
Tim Gardner [Mon, 28 Dec 2015 23:13:48 +0000 (16:13 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Ubuntu-4.4.0-0.7
Tim Gardner [Tue, 22 Dec 2015 13:04:07 +0000 (06:04 -0700)]
UBUNTU: Ubuntu-4.4.0-0.7

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: rebase to v4.4-rc6
Tim Gardner [Mon, 21 Dec 2015 13:21:05 +0000 (06:21 -0700)]
UBUNTU: rebase to v4.4-rc6

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: SAUCE: (noup) ptrace: being capable wrt a process requires mapped uids/gids
Jann Horn [Sat, 12 Dec 2015 20:12:41 +0000 (21:12 +0100)]
UBUNTU: SAUCE: (noup) ptrace: being capable wrt a process requires mapped uids/gids

BugLink: http://bugs.launchpad.net/bugs/1527374
ptrace_has_cap() checks whether the current process should be
treated as having a certain capability for ptrace checks
against another process. Until now, this was equivalent to
has_ns_capability(current, target_ns, CAP_SYS_PTRACE).

However, if a root-owned process wants to enter a user
namespace for some reason without knowing who owns it and
therefore can't change to the namespace owner's uid and gid
before entering, as soon as it has entered the namespace,
the namespace owner can attach to it via ptrace and thereby
gain access to its uid and gid.

While it is possible for the entering process to switch to
the uid of a claimed namespace owner before entering,
causing the attempt to enter to fail if the claimed uid is
wrong, this doesn't solve the problem of determining an
appropriate gid.

With this change, the entering process can first enter the
namespace and then safely inspect the namespace's
properties, e.g. through /proc/self/{uid_map,gid_map},
assuming that the namespace owner doesn't have access to
uid 0.

Signed-off-by: Jann Horn <jann@thejh.net>
Reference: https://lkml.org/lkml/2015/12/12/259
Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
8 years agoUBUNTU: [Config] CONFIG_I2C_DESIGNWARE_BAYTRAIL=y, CONFIG_IOSF_MBI=y
Hui Wang [Thu, 17 Dec 2015 07:54:42 +0000 (15:54 +0800)]
UBUNTU: [Config] CONFIG_I2C_DESIGNWARE_BAYTRAIL=y, CONFIG_IOSF_MBI=y

BugLink: http://bugs.launchpad.net/bugs/1527096
This commit wants to enable the Intel Baytrail I2C semaphore, this
driver was added into the kernel from v4.0.

The driver implements a hardware semphore to protect the I2C bus to
be shared among several users safely.

We have met a problem on a Cherry Trail platform, when we insert the
SD storage card into the SD slot, the system will hang, after enable
this driver in the kernel, the problem disappers.

This driver depends on the "CONFIG_IOSF_MBI=y", so we change this
config item from m to y.

Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Start new release
Tim Gardner [Thu, 17 Dec 2015 12:29:07 +0000 (05:29 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Ubuntu-4.4.0-0.6
Tim Gardner [Wed, 16 Dec 2015 14:09:20 +0000 (07:09 -0700)]
UBUNTU: Ubuntu-4.4.0-0.6

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] disable CONFIG_CRYPTO_AES_ARM64_CE* to avoid issues with ARMv8.1...
Andy Whitcroft [Tue, 15 Dec 2015 10:26:24 +0000 (10:26 +0000)]
UBUNTU: [Config] disable CONFIG_CRYPTO_AES_ARM64_CE* to avoid issues with ARMv8.1 support in latest compilers

Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Config] disable CONFIG_ARM64_LSE_ATOMICS to avoid issues with ARMv8.1 suppor...
Andy Whitcroft [Tue, 15 Dec 2015 10:22:54 +0000 (10:22 +0000)]
UBUNTU: [Config] disable CONFIG_ARM64_LSE_ATOMICS to avoid issues with ARMv8.1 support in latest compilers

Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: Start new release
Tim Gardner [Tue, 15 Dec 2015 13:47:05 +0000 (06:47 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] s390 -> s390x
Tim Gardner [Tue, 15 Dec 2015 13:32:14 +0000 (13:32 +0000)]
UBUNTU: [Config] s390 -> s390x

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Ubuntu-4.4.0-0.5
Tim Gardner [Mon, 14 Dec 2015 12:30:17 +0000 (05:30 -0700)]
UBUNTU: Ubuntu-4.4.0-0.5

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: rebase to v4.4-rc5
Tim Gardner [Mon, 14 Dec 2015 12:29:12 +0000 (05:29 -0700)]
UBUNTU: rebase to v4.4-rc5

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] s390x -- enable ABI checks
Andy Whitcroft [Wed, 9 Dec 2015 09:45:04 +0000 (09:45 +0000)]
UBUNTU: [Config] s390x -- enable ABI checks

Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Config] s390x -- add s390x ABI information
Andy Whitcroft [Wed, 9 Dec 2015 09:44:42 +0000 (09:44 +0000)]
UBUNTU: [Config] s390x -- add s390x ABI information

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] s390x -- add architecture to getabis
Andy Whitcroft [Wed, 9 Dec 2015 09:43:10 +0000 (09:43 +0000)]
UBUNTU: [Config] s390x -- add architecture to getabis

Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Config] s390x -- enable tools
Andy Whitcroft [Wed, 9 Dec 2015 09:41:44 +0000 (09:41 +0000)]
UBUNTU: [Config] s390x -- enable tools

We are not yet making tools packages for s390x.  Enable the basic tools
to fill out this package.

BugLink: http://bugs.launchpad.net/bugs/1524319
Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Config] Add s390 modules to nic-modules udeb
Tim Gardner [Fri, 11 Dec 2015 22:18:51 +0000 (15:18 -0700)]
UBUNTU: [Config] Add s390 modules to nic-modules udeb

BugLink: http://bugs.launchpad.net/bugs/1525297
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Debian] config-check and prepare using ${DEBIAN}/config/annotations
Tim Gardner [Tue, 6 Oct 2015 16:07:03 +0000 (10:07 -0600)]
UBUNTU: [Debian] config-check and prepare using ${DEBIAN}/config/annotations

Annotations are unique to the derivative. Therefore, use annotations
found in the derivative config directory.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
(cherry picked from commit 4f92f80963c358c9716e70d912449a7c2a5808aa)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
8 years agoUBUNTU: Ubuntu-4.4.0-0.4
Tim Gardner [Tue, 8 Dec 2015 18:22:03 +0000 (11:22 -0700)]
UBUNTU: Ubuntu-4.4.0-0.4

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Ubuntu-4.4.0-0.3
Tim Gardner [Mon, 7 Dec 2015 02:08:55 +0000 (19:08 -0700)]
UBUNTU: Ubuntu-4.4.0-0.3

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: rebase to v4.4-rc4
Tim Gardner [Sun, 6 Dec 2015 23:58:35 +0000 (16:58 -0700)]
UBUNTU: rebase to v4.4-rc4

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Start new release
Tim Gardner [Sun, 6 Dec 2015 23:51:14 +0000 (16:51 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Ubuntu-4.4.0-0.2
Tim Gardner [Thu, 3 Dec 2015 15:30:29 +0000 (08:30 -0700)]
UBUNTU: Ubuntu-4.4.0-0.2

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Start new release
Tim Gardner [Thu, 3 Dec 2015 14:06:47 +0000 (07:06 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] Include all s390 specific drivers in linux-image
Tim Gardner [Thu, 3 Dec 2015 14:01:35 +0000 (07:01 -0700)]
UBUNTU: [Config] Include all s390 specific drivers in linux-image

BugLink: http://bugs.launchpad.net/bugs/1522210
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] Add zfs to d-i fs-core-modules
Tim Gardner [Wed, 2 Dec 2015 19:46:59 +0000 (12:46 -0700)]
UBUNTU: [Config] Add zfs to d-i fs-core-modules

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] Add spl/zfs provides to generic and powerpc64-smp
Tim Gardner [Wed, 2 Dec 2015 17:24:04 +0000 (10:24 -0700)]
UBUNTU: [Config] Add spl/zfs provides to generic and powerpc64-smp

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Ubuntu-4.4.0-0.1
Tim Gardner [Wed, 2 Dec 2015 15:30:31 +0000 (08:30 -0700)]
UBUNTU: Ubuntu-4.4.0-0.1

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] s390x -- disable abi/module checks for s390x
Andy Whitcroft [Tue, 1 Dec 2015 22:29:09 +0000 (22:29 +0000)]
UBUNTU: [Config] s390x -- disable abi/module checks for s390x

Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Config] include ibmveth in nic-modules for ppc64el
Andy Whitcroft [Tue, 1 Dec 2015 18:12:07 +0000 (18:12 +0000)]
UBUNTU: [Config] include ibmveth in nic-modules for ppc64el

BugLink: http://bugs.launchpad.net/bugs/1521712
Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Config] move ibm disk and ethernet drivers to linux-image
Andy Whitcroft [Tue, 1 Dec 2015 18:07:26 +0000 (18:07 +0000)]
UBUNTU: [Config] move ibm disk and ethernet drivers to linux-image

BugLink: http://bugs.launchpad.net/bugs/1521712
Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Config] follow ibmvscsi name change
Andy Whitcroft [Tue, 1 Dec 2015 17:45:19 +0000 (17:45 +0000)]
UBUNTU: [Config] follow ibmvscsi name change

BugLink: http://bugs.launchpad.net/bugs/1521712
Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Config] make IBMVETH consistent on powerpc/ppc64el
Andy Whitcroft [Tue, 1 Dec 2015 17:31:38 +0000 (17:31 +0000)]
UBUNTU: [Config] make IBMVETH consistent on powerpc/ppc64el

BugLink: http://bugs.launchpad.net/bugs/1521712
Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: SAUCE: AUFS
Tim Gardner [Wed, 2 Dec 2015 14:28:37 +0000 (07:28 -0700)]
UBUNTU: SAUCE: AUFS

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] CONFIG_AUFS_FS=m
Tim Gardner [Wed, 2 Dec 2015 14:40:27 +0000 (07:40 -0700)]
UBUNTU: [Config] CONFIG_AUFS_FS=m

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoSPL: Update with 4.4 support
Tim Gardner [Wed, 2 Dec 2015 14:09:22 +0000 (07:09 -0700)]
SPL: Update with 4.4 support

Temporary hack until the archive package is updated. I
cherry picked commits from master e7b75d9b46fcfea149bf7fd1f53d40379e3c7b5d on
to spl-0.6.5-release, then rsync'd the whole thing.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoZFS: Update with 4.4 support
Tim Gardner [Wed, 2 Dec 2015 13:55:25 +0000 (06:55 -0700)]
ZFS: Update with 4.4 support

Temporary hack until the archive package is updated. I
cherry picked commits from master 61d482f7cd1687177185140699c6843c904b38d4 on
to zfs-0.6.5-release, then rsync'd the whole thing.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: rebase to v4.4-rc3
Tim Gardner [Mon, 30 Nov 2015 14:39:27 +0000 (07:39 -0700)]
UBUNTU: rebase to v4.4-rc3

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Debian] Disable udebs when cross compiling
Tim Gardner [Sun, 29 Nov 2015 03:38:57 +0000 (20:38 -0700)]
UBUNTU: [Debian] Disable udebs when cross compiling

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] CONFIG_LUSTRE_FS=n
Tim Gardner [Sun, 29 Nov 2015 03:15:56 +0000 (20:15 -0700)]
UBUNTU: [Config] CONFIG_LUSTRE_FS=n

depmod: ERROR: Found 2 modules in dependency cycles!
depmod: ERROR: Cycle detected: lnet -> libcfs -> lnet

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: SAUCE: do_zfs=false temporarily
Tim Gardner [Sun, 29 Nov 2015 03:06:17 +0000 (20:06 -0700)]
UBUNTU: SAUCE: do_zfs=false temporarily

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] s390s -- disable ABI/module checks
Andy Whitcroft [Wed, 25 Nov 2015 11:31:06 +0000 (11:31 +0000)]
UBUNTU: [Config] s390s -- disable ABI/module checks

Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Config] s390x -- disable ZFS temporarily
Andy Whitcroft [Wed, 25 Nov 2015 14:03:51 +0000 (14:03 +0000)]
UBUNTU: [Config] s390x -- disable ZFS temporarily

BugLink: http://bugs.launchpad.net/bugs/1519820
Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Config] s390x -- include dasd modules in linux-image
Andy Whitcroft [Wed, 25 Nov 2015 14:02:58 +0000 (14:02 +0000)]
UBUNTU: [Config] s390x -- include dasd modules in linux-image

BugLink: http://bugs.launchpad.net/bugs/1519833
Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Config] s390x -- add dasd udebs
Andy Whitcroft [Wed, 25 Nov 2015 13:49:20 +0000 (13:49 +0000)]
UBUNTU: [Config] s390x -- add dasd udebs

BugLink: http://bugs.launchpad.net/bugs/1519833
Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Debian] Disable SPL/ZFS for cross compiling -- redux
Andy Whitcroft [Wed, 25 Nov 2015 11:23:31 +0000 (11:23 +0000)]
UBUNTU: [Debian] Disable SPL/ZFS for cross compiling -- redux

Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Config] libunwind8-dev is not available on s390x
Andy Whitcroft [Wed, 25 Nov 2015 10:26:38 +0000 (10:26 +0000)]
UBUNTU: [Config] libunwind8-dev is not available on s390x

Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Config] CONFIG_WILC1000_DRIVER=n for FTBS
Tim Gardner [Mon, 23 Nov 2015 20:50:09 +0000 (13:50 -0700)]
UBUNTU: [Config] CONFIG_WILC1000_DRIVER=n for FTBS

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] updateconfigs
Tim Gardner [Mon, 23 Nov 2015 20:36:02 +0000 (13:36 -0700)]
UBUNTU: [Config] updateconfigs

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: rebase to v4.4-rc2
Tim Gardner [Mon, 23 Nov 2015 20:24:26 +0000 (13:24 -0700)]
UBUNTU: rebase to v4.4-rc2

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Start new release
Tim Gardner [Mon, 23 Nov 2015 20:23:29 +0000 (13:23 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] CONFIG_DRM_AMDGPU_CIK=n
Seth Forshee [Thu, 19 Nov 2015 13:43:33 +0000 (07:43 -0600)]
UBUNTU: [Config] CONFIG_DRM_AMDGPU_CIK=n

CIK support in amdgpu is currently experimental, and the upstream
maintainers do not recommend enabling it. Disabling CIK support
in amdgpu will result in falling back to the radeon driver, which
also supports this hardware.

BugLink: http://bugs.launchpad.net/bugs/1510405
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Config] CONFIG_SCSI_IBMVSCSI=m
Tim Gardner [Mon, 16 Nov 2015 20:27:28 +0000 (13:27 -0700)]
UBUNTU: [Config] CONFIG_SCSI_IBMVSCSI=m

BugLink: http://bugs.launchpad.net/bugs/1515872
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: [Tests] gcc-multilib does not exist on ppc64el redux
Andy Whitcroft [Mon, 16 Nov 2015 18:15:03 +0000 (18:15 +0000)]
UBUNTU: [Tests] gcc-multilib does not exist on ppc64el redux

Actually debian/control/tests can only have positive architectures
limits.  Switch this dependancy to a positive list.

BugLink: http://bugs.launchpad.net/bugs/1515541
Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Debian] Disable SPL/ZFS for cross compiling
Tim Gardner [Thu, 12 Nov 2015 23:37:17 +0000 (16:37 -0700)]
UBUNTU: [Debian] Disable SPL/ZFS for cross compiling

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: Ubuntu-4.3.0-0.8
Tim Gardner [Thu, 12 Nov 2015 19:38:17 +0000 (12:38 -0700)]
UBUNTU: Ubuntu-4.3.0-0.8

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
8 years agoUBUNTU: SAUCE: fan: add VXLAN implementation
Jay Vosburgh [Wed, 11 Nov 2015 13:04:50 +0000 (13:04 +0000)]
UBUNTU: SAUCE: fan: add VXLAN implementation

Generify the fan mapping support and utilise that to implement fan
mappings over vxlan transport.

Expose the existance of this functionality (when the module is loaded)
via an additional sysctl marker.

Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>
[apw@canonical.com: added feature marker for fan over vxlan.]
Signed-off-by: Andy Whitcroft <apw@canonical.com>
8 years agoUBUNTU: [Tests] gcc-multilib does not exist on ppc64el
Andy Whitcroft [Thu, 12 Nov 2015 10:13:07 +0000 (10:13 +0000)]
UBUNTU: [Tests] gcc-multilib does not exist on ppc64el

We have a hard dependency on gcc-multilib which is not available on
ppc64el.  Drop this dependancy by making it arch conditional.

BugLink: http://bugs.launchpad.net/bugs/1515541
Signed-off-by: Andy Whitcroft <apw@canonical.com>