mbox

Pull request, re-sync ZFS to Xenial

Message ID 56FD7F24.8060701@canonical.com
State New
Headers show

Pull-request

git://kernel.ubuntu.com/cking/xenial master-next

Message

Colin Ian King March 31, 2016, 7:48 p.m. UTC 
Fixes for two issues:
 * Add support 32 bit FS_IOC32_{GET|SET}FLAGS compat ioctls
   for (powerpc64 big endian mode)
 * Fix aarch64 compilation, missing hrtime_t and timestruc_t types

BugLink: http://bugs.launchpad.net/bugs/1564591

The following changes since commit 644c5f2f0db2dbfb977d11d3cd3c44932e45de1d:

  UBUNTU: [Debian] fix linux_tools when cross-compiling (2016-03-31
07:59:50 -0600)

are available in the git repository at:

  git://kernel.ubuntu.com/cking/xenial master-next

for you to fetch changes up to aca130ac5d7ff37e91e16a54d63f9fb5d7cf441c:

  UBUNTU: SAUCE: (noup) Update spl to 0.6.5.6-0ubuntu1, zfs to
0.6.5.6-0ubuntu3 (2016-03-31 20:45:07 +0100)

----------------------------------------------------------------
Colin Ian King (1):
      UBUNTU: SAUCE: (noup) Update spl to 0.6.5.6-0ubuntu1, zfs to
0.6.5.6-0ubuntu3

 spl/rpm/redhat/spl-dkms.spec.in               | 72 +++++++++++++++++++++-
 spl/rpm/redhat/spl.spec.in                    | 72 +++++++++++++++++++++-
 zfs/META                                      |  2 +-
 zfs/module/zfs/zpl_file.c                     | 15 ++++-
 zfs/rpm/redhat/zfs-dkms.spec.in               |  3 +-
 zfs/rpm/redhat/zfs.spec.in                    |  3 +-
 zfs/scripts/zpios-test/large-thread-survey.sh |  1 -
 zfs/scripts/zpios-test/large.sh               |  1 -
 zfs/scripts/zpios-test/medium.sh              |  1 -
 zfs/scripts/zpios-test/small.sh               |  1 -
 zfs/scripts/zpios-test/tiny.sh                |  1 -
 11 files changed, 161 insertions(+), 11 deletions(-)
 mode change 120000 => 100644 spl/rpm/redhat/spl-dkms.spec.in
 mode change 120000 => 100644 spl/rpm/redhat/spl.spec.in
 mode change 120000 => 100644 zfs/rpm/redhat/zfs-dkms.spec.in
 mode change 120000 => 100644 zfs/rpm/redhat/zfs.spec.in
 delete mode 120000 zfs/scripts/zpios-test/large-thread-survey.sh
 delete mode 120000 zfs/scripts/zpios-test/large.sh
 delete mode 120000 zfs/scripts/zpios-test/medium.sh
 delete mode 120000 zfs/scripts/zpios-test/small.sh
 delete mode 120000 zfs/scripts/zpios-test/tiny.sh

Comments

Colin Ian King March 31, 2016, 9:41 p.m. UTC | #1 
NAK.

Discussing this with upstream, there's also another ioctl fix required
for a case I didn't test. I'll get that sorted out when I get some time
tomorrow and re-send the pull request.


On 31/03/16 20:48, Colin Ian King wrote:
> 
> Fixes for two issues:
>  * Add support 32 bit FS_IOC32_{GET|SET}FLAGS compat ioctls
>    for (powerpc64 big endian mode)
>  * Fix aarch64 compilation, missing hrtime_t and timestruc_t types
> 
> BugLink: http://bugs.launchpad.net/bugs/1564591
> 
> The following changes since commit 644c5f2f0db2dbfb977d11d3cd3c44932e45de1d:
> 
>   UBUNTU: [Debian] fix linux_tools when cross-compiling (2016-03-31
> 07:59:50 -0600)
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/cking/xenial master-next
> 
> for you to fetch changes up to aca130ac5d7ff37e91e16a54d63f9fb5d7cf441c:
> 
>   UBUNTU: SAUCE: (noup) Update spl to 0.6.5.6-0ubuntu1, zfs to
> 0.6.5.6-0ubuntu3 (2016-03-31 20:45:07 +0100)
> 
> ----------------------------------------------------------------
> Colin Ian King (1):
>       UBUNTU: SAUCE: (noup) Update spl to 0.6.5.6-0ubuntu1, zfs to
> 0.6.5.6-0ubuntu3
> 
>  spl/rpm/redhat/spl-dkms.spec.in               | 72 +++++++++++++++++++++-
>  spl/rpm/redhat/spl.spec.in                    | 72 +++++++++++++++++++++-
>  zfs/META                                      |  2 +-
>  zfs/module/zfs/zpl_file.c                     | 15 ++++-
>  zfs/rpm/redhat/zfs-dkms.spec.in               |  3 +-
>  zfs/rpm/redhat/zfs.spec.in                    |  3 +-
>  zfs/scripts/zpios-test/large-thread-survey.sh |  1 -
>  zfs/scripts/zpios-test/large.sh               |  1 -
>  zfs/scripts/zpios-test/medium.sh              |  1 -
>  zfs/scripts/zpios-test/small.sh               |  1 -
>  zfs/scripts/zpios-test/tiny.sh                |  1 -
>  11 files changed, 161 insertions(+), 11 deletions(-)
>  mode change 120000 => 100644 spl/rpm/redhat/spl-dkms.spec.in
>  mode change 120000 => 100644 spl/rpm/redhat/spl.spec.in
>  mode change 120000 => 100644 zfs/rpm/redhat/zfs-dkms.spec.in
>  mode change 120000 => 100644 zfs/rpm/redhat/zfs.spec.in
>  delete mode 120000 zfs/scripts/zpios-test/large-thread-survey.sh
>  delete mode 120000 zfs/scripts/zpios-test/large.sh
>  delete mode 120000 zfs/scripts/zpios-test/medium.sh
>  delete mode 120000 zfs/scripts/zpios-test/small.sh
>  delete mode 120000 zfs/scripts/zpios-test/tiny.sh
>
Colin Ian King April 1, 2016, 6:47 a.m. UTC | #2 
Please ignore the NAK, subsequent information from upstream, the
unimplemented compat 32 ioctls don't pass data, so their requires no
further fix up, so this patch is fine after all.

Colin

On 31/03/16 22:41, Colin Ian King wrote:
> NAK.
> 
> Discussing this with upstream, there's also another ioctl fix required
> for a case I didn't test. I'll get that sorted out when I get some time
> tomorrow and re-send the pull request.
> 
> 
> On 31/03/16 20:48, Colin Ian King wrote:
>>
>> Fixes for two issues:
>>  * Add support 32 bit FS_IOC32_{GET|SET}FLAGS compat ioctls
>>    for (powerpc64 big endian mode)
>>  * Fix aarch64 compilation, missing hrtime_t and timestruc_t types
>>
>> BugLink: http://bugs.launchpad.net/bugs/1564591
>>
>> The following changes since commit 644c5f2f0db2dbfb977d11d3cd3c44932e45de1d:
>>
>>   UBUNTU: [Debian] fix linux_tools when cross-compiling (2016-03-31
>> 07:59:50 -0600)
>>
>> are available in the git repository at:
>>
>>   git://kernel.ubuntu.com/cking/xenial master-next
>>
>> for you to fetch changes up to aca130ac5d7ff37e91e16a54d63f9fb5d7cf441c:
>>
>>   UBUNTU: SAUCE: (noup) Update spl to 0.6.5.6-0ubuntu1, zfs to
>> 0.6.5.6-0ubuntu3 (2016-03-31 20:45:07 +0100)
>>
>> ----------------------------------------------------------------
>> Colin Ian King (1):
>>       UBUNTU: SAUCE: (noup) Update spl to 0.6.5.6-0ubuntu1, zfs to
>> 0.6.5.6-0ubuntu3
>>
>>  spl/rpm/redhat/spl-dkms.spec.in               | 72 +++++++++++++++++++++-
>>  spl/rpm/redhat/spl.spec.in                    | 72 +++++++++++++++++++++-
>>  zfs/META                                      |  2 +-
>>  zfs/module/zfs/zpl_file.c                     | 15 ++++-
>>  zfs/rpm/redhat/zfs-dkms.spec.in               |  3 +-
>>  zfs/rpm/redhat/zfs.spec.in                    |  3 +-
>>  zfs/scripts/zpios-test/large-thread-survey.sh |  1 -
>>  zfs/scripts/zpios-test/large.sh               |  1 -
>>  zfs/scripts/zpios-test/medium.sh              |  1 -
>>  zfs/scripts/zpios-test/small.sh               |  1 -
>>  zfs/scripts/zpios-test/tiny.sh                |  1 -
>>  11 files changed, 161 insertions(+), 11 deletions(-)
>>  mode change 120000 => 100644 spl/rpm/redhat/spl-dkms.spec.in
>>  mode change 120000 => 100644 spl/rpm/redhat/spl.spec.in
>>  mode change 120000 => 100644 zfs/rpm/redhat/zfs-dkms.spec.in
>>  mode change 120000 => 100644 zfs/rpm/redhat/zfs.spec.in
>>  delete mode 120000 zfs/scripts/zpios-test/large-thread-survey.sh
>>  delete mode 120000 zfs/scripts/zpios-test/large.sh
>>  delete mode 120000 zfs/scripts/zpios-test/medium.sh
>>  delete mode 120000 zfs/scripts/zpios-test/small.sh
>>  delete mode 120000 zfs/scripts/zpios-test/tiny.sh
>>
>
Tim Gardner April 1, 2016, 12:38 p.m. UTC | #3 
On 04/01/2016 12:47 AM, Colin Ian King wrote:
> git://kernel.ubuntu.com/cking/xenial master-next