Re: linux-next: Tree for Oct 18 (objtool)

2019-10-22 Thread Christian Brauner 
On Tue, Oct 22, 2019 at 09:40:34AM +0200, Peter Zijlstra wrote:
> On Mon, Oct 21, 2019 at 09:36:53PM +0200, Christian Brauner wrote:
> > Ok, so I take it you route that patch somehwere through tip?
> > I'm happy with the ubsan fix:
> 
> Yeah, I'll go make a real patch with Changelog of it and stick it in
> tip.

Excellent! Thanks!
Christian

Re: linux-next: Tree for Oct 18 (objtool)

2019-10-22 Thread Peter Zijlstra 
On Mon, Oct 21, 2019 at 09:36:53PM +0200, Christian Brauner wrote:
> Ok, so I take it you route that patch somehwere through tip?
> I'm happy with the ubsan fix:

Yeah, I'll go make a real patch with Changelog of it and stick it in
tip.

> Acked-by: Christian Brauner 

Thanks!

Re: linux-next: Tree for Oct 18 (objtool)

2019-10-21 Thread Christian Brauner 
On Mon, Oct 21, 2019 at 03:47:59PM +0200, Peter Zijlstra wrote:
> On Mon, Oct 21, 2019 at 03:19:48PM +0200, Christian Brauner wrote:
> > On Mon, Oct 21, 2019 at 03:11:49PM +0200, Peter Zijlstra wrote:
> 
> > > By popular request; here's that alternative. Completely untested :-)
> > 
> > Am I not getting some mails? :)
> 
> You're not on the 'right' IRC channels :-)

Well, we saw that that wasn't true today. :)

> 
> > I prefer this one as it allows us to avoid working around this in
> > usercopy.c. Should especially make if this potentially helps in other
> > cases as well?
> 
> That was Josh's argument too.
> 
> Personally I think GCC is being a moron here, because with value range
> analysis it should be able to prove the shift-UB cannot happen (the <
> sizeof(unsigned long) conditions on both), but alas, it emits the UBSAN
> calls anyway.

Ok, so I take it you route that patch somehwere through tip?
I'm happy with the ubsan fix:

Acked-by: Christian Brauner

Re: linux-next: Tree for Oct 18 (objtool)

2019-10-21 Thread Randy Dunlap 
On 10/21/19 6:11 AM, Peter Zijlstra wrote:
> On Mon, Oct 21, 2019 at 02:35:49PM +0200, Peter Zijlstra wrote:
>> On Fri, Oct 18, 2019 at 08:33:11AM -0700, Randy Dunlap wrote:
>>> On 10/18/19 12:03 AM, Stephen Rothwell wrote:
 Hi all,

 Changes since 20191017:

>>>
>>> on x86_64:
>>> lib/usercopy.o: warning: objtool: check_zeroed_user()+0x35f: call to 
>>> __ubsan_handle_shift_out_of_bounds() with UACCESS enabled
>>
>> Blergh... I suppose the below will fix that. I'm a bit conflicted on it
>> though, the alternative is annotating more ubsan crud.
> 
> By popular request; here's that alternative. Completely untested :-)

Both patch versions build-tested successfully.  Thanks.
Acked-by: Randy Dunlap 


> ---
>  lib/ubsan.c   | 5 -
>  tools/objtool/check.c | 1 +
>  2 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/ubsan.c b/lib/ubsan.c
> index 39d5952c4273..0dce3ff45b5b 100644
> --- a/lib/ubsan.c
> +++ b/lib/ubsan.c
> @@ -359,9 +359,10 @@ void __ubsan_handle_shift_out_of_bounds(struct 
> shift_out_of_bounds_data *data,
>   struct type_descriptor *lhs_type = data->lhs_type;
>   char rhs_str[VALUE_LENGTH];
>   char lhs_str[VALUE_LENGTH];
> + unsigned long flags = user_access_save();
>  
>   if (suppress_report(&data->location))
> - return;
> + goto out;
>  
>   ubsan_prologue(&data->location);
>  
> @@ -387,6 +388,8 @@ void __ubsan_handle_shift_out_of_bounds(struct 
> shift_out_of_bounds_data *data,
>   lhs_type->type_name);
>  
>   ubsan_epilogue();
> +out:
> + user_access_restore(flags);
>  }
>  EXPORT_SYMBOL(__ubsan_handle_shift_out_of_bounds);
>  
> diff --git a/tools/objtool/check.c b/tools/objtool/check.c
> index 543c068096b1..4768d91c6d68 100644
> --- a/tools/objtool/check.c
> +++ b/tools/objtool/check.c
> @@ -482,6 +482,7 @@ static const char *uaccess_safe_builtin[] = {
>   "ubsan_type_mismatch_common",
>   "__ubsan_handle_type_mismatch",
>   "__ubsan_handle_type_mismatch_v1",
> + "__ubsan_handle_shift_out_of_bounds",
>   /* misc */
>   "csum_partial_copy_generic",
>   "__memcpy_mcsafe",
> 


-- 
~Randy

Re: linux-next: Tree for Oct 18 (objtool)

2019-10-21 Thread Peter Zijlstra 
On Mon, Oct 21, 2019 at 03:19:48PM +0200, Christian Brauner wrote:
> On Mon, Oct 21, 2019 at 03:11:49PM +0200, Peter Zijlstra wrote:

> > By popular request; here's that alternative. Completely untested :-)
> 
> Am I not getting some mails? :)

You're not on the 'right' IRC channels :-)

> I prefer this one as it allows us to avoid working around this in
> usercopy.c. Should especially make if this potentially helps in other
> cases as well?

That was Josh's argument too.

Personally I think GCC is being a moron here, because with value range
analysis it should be able to prove the shift-UB cannot happen (the <
sizeof(unsigned long) conditions on both), but alas, it emits the UBSAN
calls anyway.

Re: linux-next: Tree for Oct 18 (objtool)

2019-10-21 Thread Christian Brauner 
On Mon, Oct 21, 2019 at 03:11:49PM +0200, Peter Zijlstra wrote:
> On Mon, Oct 21, 2019 at 02:35:49PM +0200, Peter Zijlstra wrote:
> > On Fri, Oct 18, 2019 at 08:33:11AM -0700, Randy Dunlap wrote:
> > > On 10/18/19 12:03 AM, Stephen Rothwell wrote:
> > > > Hi all,
> > > > 
> > > > Changes since 20191017:
> > > > 
> > > 
> > > on x86_64:
> > > lib/usercopy.o: warning: objtool: check_zeroed_user()+0x35f: call to 
> > > __ubsan_handle_shift_out_of_bounds() with UACCESS enabled
> > 
> > Blergh... I suppose the below will fix that. I'm a bit conflicted on it
> > though, the alternative is annotating more ubsan crud.
> 
> By popular request; here's that alternative. Completely untested :-)

Am I not getting some mails? :)
I prefer this one as it allows us to avoid working around this in
usercopy.c. Should especially make if this potentially helps in other
cases as well?

> 
> ---
>  lib/ubsan.c   | 5 -
>  tools/objtool/check.c | 1 +
>  2 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/ubsan.c b/lib/ubsan.c
> index 39d5952c4273..0dce3ff45b5b 100644
> --- a/lib/ubsan.c
> +++ b/lib/ubsan.c
> @@ -359,9 +359,10 @@ void __ubsan_handle_shift_out_of_bounds(struct 
> shift_out_of_bounds_data *data,
>   struct type_descriptor *lhs_type = data->lhs_type;
>   char rhs_str[VALUE_LENGTH];
>   char lhs_str[VALUE_LENGTH];
> + unsigned long flags = user_access_save();
>  
>   if (suppress_report(&data->location))
> - return;
> + goto out;
>  
>   ubsan_prologue(&data->location);
>  
> @@ -387,6 +388,8 @@ void __ubsan_handle_shift_out_of_bounds(struct 
> shift_out_of_bounds_data *data,
>   lhs_type->type_name);
>  
>   ubsan_epilogue();
> +out:
> + user_access_restore(flags);
>  }
>  EXPORT_SYMBOL(__ubsan_handle_shift_out_of_bounds);
>  
> diff --git a/tools/objtool/check.c b/tools/objtool/check.c
> index 543c068096b1..4768d91c6d68 100644
> --- a/tools/objtool/check.c
> +++ b/tools/objtool/check.c
> @@ -482,6 +482,7 @@ static const char *uaccess_safe_builtin[] = {
>   "ubsan_type_mismatch_common",
>   "__ubsan_handle_type_mismatch",
>   "__ubsan_handle_type_mismatch_v1",
> + "__ubsan_handle_shift_out_of_bounds",
>   /* misc */
>   "csum_partial_copy_generic",
>   "__memcpy_mcsafe",

Re: linux-next: Tree for Oct 18 (objtool)

2019-10-21 Thread Peter Zijlstra 
On Mon, Oct 21, 2019 at 02:35:49PM +0200, Peter Zijlstra wrote:
> On Fri, Oct 18, 2019 at 08:33:11AM -0700, Randy Dunlap wrote:
> > On 10/18/19 12:03 AM, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > Changes since 20191017:
> > > 
> > 
> > on x86_64:
> > lib/usercopy.o: warning: objtool: check_zeroed_user()+0x35f: call to 
> > __ubsan_handle_shift_out_of_bounds() with UACCESS enabled
> 
> Blergh... I suppose the below will fix that. I'm a bit conflicted on it
> though, the alternative is annotating more ubsan crud.

By popular request; here's that alternative. Completely untested :-)

---
 lib/ubsan.c   | 5 -
 tools/objtool/check.c | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/ubsan.c b/lib/ubsan.c
index 39d5952c4273..0dce3ff45b5b 100644
--- a/lib/ubsan.c
+++ b/lib/ubsan.c
@@ -359,9 +359,10 @@ void __ubsan_handle_shift_out_of_bounds(struct 
shift_out_of_bounds_data *data,
struct type_descriptor *lhs_type = data->lhs_type;
char rhs_str[VALUE_LENGTH];
char lhs_str[VALUE_LENGTH];
+   unsigned long flags = user_access_save();
 
if (suppress_report(&data->location))
-   return;
+   goto out;
 
ubsan_prologue(&data->location);
 
@@ -387,6 +388,8 @@ void __ubsan_handle_shift_out_of_bounds(struct 
shift_out_of_bounds_data *data,
lhs_type->type_name);
 
ubsan_epilogue();
+out:
+   user_access_restore(flags);
 }
 EXPORT_SYMBOL(__ubsan_handle_shift_out_of_bounds);
 
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 543c068096b1..4768d91c6d68 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -482,6 +482,7 @@ static const char *uaccess_safe_builtin[] = {
"ubsan_type_mismatch_common",
"__ubsan_handle_type_mismatch",
"__ubsan_handle_type_mismatch_v1",
+   "__ubsan_handle_shift_out_of_bounds",
/* misc */
"csum_partial_copy_generic",
"__memcpy_mcsafe",

Re: linux-next: Tree for Oct 18 (objtool)

2019-10-21 Thread Peter Zijlstra 
On Fri, Oct 18, 2019 at 08:33:11AM -0700, Randy Dunlap wrote:
> On 10/18/19 12:03 AM, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Changes since 20191017:
> > 
> 
> on x86_64:
> lib/usercopy.o: warning: objtool: check_zeroed_user()+0x35f: call to 
> __ubsan_handle_shift_out_of_bounds() with UACCESS enabled

Blergh... I suppose the below will fix that. I'm a bit conflicted on it
though, the alternative is annotating more ubsan crud.

---
 lib/usercopy.c | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/usercopy.c b/lib/usercopy.c
index cbb4d9ec00f2..9c5245778dfd 100644
--- a/lib/usercopy.c
+++ b/lib/usercopy.c
@@ -49,21 +49,28 @@ EXPORT_SYMBOL(_copy_to_user);
  */
 int check_zeroed_user(const void __user *from, size_t size)
 {
+   unsigned long head_mask, tail_mask;
unsigned long val;
-   uintptr_t align = (uintptr_t) from % sizeof(unsigned long);
+   uintptr_t align;
 
if (unlikely(size == 0))
return 1;
 
-   from -= align;
-   size += align;
+   align = (uintptr_t) from % sizeof(unsigned long);
+   if (align) {
+   from -= align;
+   size += align;
+   head_mask = ~aligned_byte_mask(align);
+   }
+
+   tail_mask = aligned_byte_mask(size % sizeof(unsigned long));
 
if (!user_access_begin(from, size))
return -EFAULT;
 
unsafe_get_user(val, (unsigned long __user *) from, err_fault);
if (align)
-   val &= ~aligned_byte_mask(align);
+   val &= head_mask;
 
while (size > sizeof(unsigned long)) {
if (unlikely(val))
@@ -76,7 +83,7 @@ int check_zeroed_user(const void __user *from, size_t size)
}
 
if (size < sizeof(unsigned long))
-   val &= aligned_byte_mask(size);
+   val &= tail_mask;
 
 done:
user_access_end();

Re: linux-next: Tree for Oct 18 (objtool)

2019-10-18 Thread Randy Dunlap 
On 10/18/19 12:03 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20191017:
> 

on x86_64:
lib/usercopy.o: warning: objtool: check_zeroed_user()+0x35f: call to 
__ubsan_handle_shift_out_of_bounds() with UACCESS enabled

.o file is attached.

-- 
~Randy



usercopy.o
Description: application/object

linux-next: Tree for Oct 18

2019-10-18 Thread Stephen Rothwell 
Hi all,

Changes since 20191017:

The clk tree gained a conflict against the imx-mxs tree.

The pm tree gained a conflict against the printk tree.

The tip tree gained a conflict against the net-next tree.

The char-misc tree gained a conflict against the char-misc.current tree.

The akpm tree gained a conflict against the printk tree.

Non-merge commits (relative to Linus' tree): 4658
 4610 files changed, 160352 insertions(+), 71667 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, an allmodconfig for x86_64, a
multi_v7_defconfig for arm and a native build of tools/perf. After
the final fixups (if any), I do an x86_64 modules_install followed by
builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit),
ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc
and sparc64 defconfig. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 315 trees (counting Linus' and 78 trees of bug
fix patches pending for the current merge release).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

-- 
Cheers,
Stephen Rothwell

$ git checkout master
$ git reset --hard stable
Merging origin/master (84629d4370b8 Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging fixes/master (54ecb8f7028c Linux 5.4-rc1)
Merging kbuild-current/fixes (700dea5a0bea kheaders: substituting --sort in 
archive creation)
Merging arc-current/for-curr (41277ba7eb4e ARC: mm: tlb flush optim: elide 
redundant uTLB invalidates for MMUv3)
Merging arm-current/fixes (4c0742f65b4e ARM: 8914/1: NOMMU: Fix exc_ret for XIP)
Merging arm-soc-fixes/arm/fixes (dd163ca3fb49 Merge tag 'mvebu-fixes-5.4-1' of 
git://git.infradead.org/linux-mvebu into arm/fixes)
Merging arm64-fixes/for-next/fixes (777d062e5bee Merge branch 'errata/tx2-219' 
into for-next/fixes)
Merging m68k-current/for-linus (0f1979b402df m68k: Remove ioremap_fullcache())
Merging powerpc-fixes/fixes (2272905a4580 spufs: fix a crash in 
spufs_create_root())
Merging s390-fixes/fixes (062795fcdcb2 s390/uaccess: avoid (false positive) 
compiler warnings)
Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (013572a236ef net: dsa: microchip: Add shared regmap mutex)
Merging bpf/master (9e8acd9c44a0 bpf: lwtunnel: Fix reroute supplying invalid 
dst)
Merging ipsec/master (68ce6688a5ba net: sched: taprio: Fix potential integer 
overflow in taprio_set_picos_per_byte)
Merging netfilter/master (503c9addef61 ptp: fix typo of "mechanism" in Kconfig 
help text)
Merging ipvs/master (503c9addef61 ptp: fix typo of "mechanism" in Kconfig help 
text)
Merging wireless-drivers/master (d79749f7716d ath10k: fix latency issue for 
QCA988x)
Merging mac80211/master (82ad862115c2 Merge branch 'smc-fixes')
Merging rdma-fixes/for-rc (0417791536ae RDMA/mlx5: Add missing 
synchronize_srcu() for MW cases)
Merging sound-current/for-linus (94989e318b2f ALSA: hda - Force runtime PM on 
Nvidia HDMI codecs)
Merging sound-asoc-fixes/for-linus (a4ff7dff4e65 Merge branch 'asoc-5.4' into 
asoc-linus)
Merging regmap-fixes/for-linus (da0c9ea146cb Linux 5.4-rc2)
Merging regulator-fixes/for-linus (68a2d13c4d54 Merge branch 'regulator-5.4' 
into regulator-linus)
Merging spi-fixes/for-linus (09ee9e1664ba Merge branch 'spi-5.4' into spi-linus)
Merging pci-current/for-linus (54ecb8f7028c Linux 5.4-rc1)
Merging driver-core.current/driver-core-linus (82af5b660967 sysfs: Fixes 
__BIN_ATTR_WO() macro)
Merging tty.current/tty-linus (f50b6805dbb9 8250-men-mcb: fix error checking 
when get_num_ports returns -ENODEV)
Merging usb.current/usb-linus (7a7591979748 USB: usblp: fix use-after-free on 
disconnect)
Merging usb-gadget-fixes/fixes (4a56a478a525 usb: gadget: mass_storage: Fix 
races between fsg_disable and fsg_set_alt)
Merging

Re: linux-next: Tree for Oct 18

2018-10-18 Thread Guenter Roeck 
On Thu, Oct 18, 2018 at 06:02:16PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> News: I will not be doing linux-next releases next week.  Unfortunately
> this will probably be the first week of the merge window. :-(
> 

Note: Every individual on Cc: might want to have a look. Either one of
your patches or one you approved causes at least one of the problems.

Build results:
total: 135 pass: 120 fail: 15
Failed builds: 
alpha:allmodconfig 
arm:allmodconfig 
arm64:allmodconfig 
i386:allyesconfig 
i386:allmodconfig 
m68k:allmodconfig 
mips:allmodconfig 
nds32:allmodconfig 
parisc:allmodconfig 
powerpc:allmodconfig 
powerpc:ppc6xx_defconfig
s390:allmodconfig 
sh:dreamcast_defconfig 
sparc64:allmodconfig 
xtensa:allmodconfig 
Qemu test results:
total: 318 pass: 318 fail: 0

Build failures:

allmodconfig for all architectures:

fs/pstore/platform.o: In function `pstore_compression_late_init':
fs/pstore/.tmp_platform.o:(.init.text+0x0): multiple definition of `init_module'
fs/pstore/inode.o:(.init.text+0x0): first defined here

i386 (and probably other 32-bit builds):

ERROR: "__udivdi3" [drivers/scsi/myrs.ko] undefined!

powerpc:ppc6xx_defconfig:

net/sunrpc/auth_gss/gss_krb5_seal.c: In function 'gss_seq_send64_fetch_and_inc':
net/sunrpc/auth_gss/gss_krb5_seal.c:144:14: error: implicit declaration of 
function 'cmpxchg64'

sh:dreamcast_defconfig:

drivers/cdrom/gdrom.c: In function 'probe_gdrom':
drivers/cdrom/gdrom.c:797:3: error: 'rc' undeclared

Guenter

Re: linux-next: Tree for Oct 18 (cpufreq: intel_pstate)

2018-10-18 Thread Randy Dunlap 
On 10/18/18 12:02 AM, Stephen Rothwell wrote:
> Hi all,
> 
> News: I will not be doing linux-next releases next week.  Unfortunately
> this will probably be the first week of the merge window. :-(
> 
> Changes since 20181017:
> 

on x86_64 or i386:

../drivers/cpufreq/intel_pstate.c: In function 'show_base_frequency':
../drivers/cpufreq/intel_pstate.c:726:2: error: implicit declaration of 
function 'intel_pstate_get_cppc_guranteed' 
[-Werror=implicit-function-declaration]
  ratio = intel_pstate_get_cppc_guranteed(policy->cpu);
  ^


Full x86_64 randconfig file is attached.

-- 
~Randy
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 4.19.0-rc8 Kernel Configuration
#

#
# Compiler: gcc (SUSE Linux) 4.8.5
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=40805
CONFIG_CLANG_VERSION=0
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y

#
# General setup
#
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_COMPILE_TEST=y
CONFIG_LOCALVERSION=""
CONFIG_BUILD_SALT=""
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
CONFIG_HAVE_KERNEL_LZ4=y
# CONFIG_KERNEL_GZIP is not set
# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not set
CONFIG_KERNEL_LZ4=y
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
# CONFIG_CROSS_MEMORY_ATTACH is not set
CONFIG_USELIB=y
CONFIG_AUDIT=y
CONFIG_HAVE_ARCH_AUDITSYSCALL=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_WATCH=y
CONFIG_AUDIT_TREE=y

#
# IRQ subsystem
#
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_GENERIC_IRQ_MIGRATION=y
CONFIG_GENERIC_IRQ_CHIP=y
CONFIG_IRQ_DOMAIN=y
CONFIG_IRQ_SIM=y
CONFIG_IRQ_DOMAIN_HIERARCHY=y
CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
CONFIG_GENERIC_MSI_IRQ=y
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
CONFIG_GENERIC_IRQ_DEBUGFS=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_ARCH_CLOCKSOURCE_DATA=y
CONFIG_ARCH_CLOCKSOURCE_INIT=y
CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
CONFIG_GENERIC_CMOS_UPDATE=y

#
# Timers subsystem
#
CONFIG_TICK_ONESHOT=y
CONFIG_HZ_PERIODIC=y
# CONFIG_NO_HZ_IDLE is not set
# CONFIG_NO_HZ_FULL is not set
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set
CONFIG_PREEMPT_COUNT=y

#
# CPU/Task time and stats accounting
#
CONFIG_TICK_CPU_ACCOUNTING=y
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
# CONFIG_IRQ_TIME_ACCOUNTING is not set
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
# CONFIG_TASKSTATS is not set
CONFIG_PSI=y
# CONFIG_CPU_ISOLATION is not set

#
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_RCU_EXPERT is not set
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU=y
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y
CONFIG_BUILD_BIN2C=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
CONFIG_ARCH_SUPPORTS_INT128=y
# CONFIG_NUMA_BALANCING is not set
CONFIG_CGROUPS=y
# CONFIG_MEMCG is not set
# CONFIG_CGROUP_SCHED is not set
# CONFIG_CGROUP_PIDS is not set
# CONFIG_CGROUP_RDMA is not set
# CONFIG_CGROUP_FREEZER is not set
# CONFIG_CPUSETS is not set
CONFIG_CGROUP_DEVICE=y
# CONFIG_CGROUP_CPUACCT is not set
# CONFIG_CGROUP_PERF is not set
# CONFIG_CGROUP_BPF is not set
CONFIG_CGROUP_DEBUG=y
CONFIG_SOCK_CGROUP_DATA=y
# CONFIG_NAMESPACES is not set
# CONFIG_CHECKPOINT_RESTORE is not set
# CONFIG_SCHED_AUTOGROUP is not set
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_SYSFS_DEPRECATED_V2 is not set
# CONFIG_RELAY is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_RD_GZIP=y
# CONFIG_RD_BZIP2 is not set
CONFIG_RD_LZMA=y
CONFIG_RD_XZ=y
# CONFIG_RD_LZO is not set
# CONFIG_RD_LZ4 is not set
# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_HAVE_UID16=y
CONFIG_SYSCTL_EXCEPTION_TRACE=y
CONFIG_HAVE_PCSPKR_PLATFORM=y
CONFIG_BPF=y
CONFIG_EXPERT=y
CONFIG_UID16=y
CONFIG_MULTIUSER=y
# CONFIG_SGETMASK_SYSCALL is not set
# CONFIG_SYSFS_SYSCALL is not set
CONFIG_SYSCTL_SYSCALL=y
# CONFIG_FHANDLE is not set
# CONFIG_POSIX_TIMERS is not set
# CONFIG_PRINTK is not set
# CONFIG_BUG is not set
CONFIG_ELF_CORE=y
CONFIG_PCSPKR_PLATFORM=y
# CONFIG_BASE_FULL is not set
CONFIG_FUTEX=y
CONFIG_FUTEX_PI=y
CONFIG_EPOLL=y
# CONFIG_SIGNALFD is not set
CONFIG_TIMERFD=y
# CONFIG_EVENTFD is not set
# CONFIG_SHMEM is not set
# CONFIG_AIO is not set
CONFIG_ADVISE_SYSCALLS=y
CONFIG_MEMBARRIER=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
CONF

linux-next: Tree for Oct 18

2018-10-18 Thread Stephen Rothwell 
Hi all,

News: I will not be doing linux-next releases next week.  Unfortunately
this will probably be the first week of the merge window. :-(

Changes since 20181017:

The kvm tree gained a conflict against Linus' tree.

The kvm-arm tree gained a conflict against the kvm tree.

The scsi-mkp tree gained a conflict against Linus' tree.

The kselftest tree gained a conflict against the kvm tree.

Non-merge commits (relative to Linus' tree): 11106
 10089 files changed, 542121 insertions(+), 239599 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, an allmodconfig for x86_64, a
multi_v7_defconfig for arm and a native build of tools/perf. After
the final fixups (if any), I do an x86_64 modules_install followed by
builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit),
ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc
and sparc64 defconfig. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 291 trees (counting Linus' and 66 trees of bug
fix patches pending for the current merge release).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

-- 
Cheers,
Stephen Rothwell

$ git checkout master
$ git reset --hard stable
Merging origin/master (c343db455eb3 Merge branch 'parisc-4.19-3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging fixes/master (eb81bfb224ce Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging kbuild-current/fixes (5318321d367c samples: disable CONFIG_SAMPLES for 
UML)
Merging arc-current/for-curr (56d02dd9e794 ARC: IOC: panic if kernel was 
started with previously enabled IOC)
Merging arm-current/fixes (3a58ac65e2d7 ARM: 8799/1: mm: fix pci_ioremap_io() 
offset check)
Merging arm64-fixes/for-next/fixes (ca2b497253ad arm64: perf: Reject 
stand-alone CHAIN events for PMUv3)
Merging m68k-current/for-linus (0986b16ab49b m68k/mac: Use correct PMU response 
format)
Merging powerpc-fixes/fixes (ac1788cc7da4 powerpc/numa: Skip onlining a offline 
node in kdump path)
Merging sparc/master (b955a910d7fd Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (0ac1077e3a54 sctp: get pr_assoc and pr_stream all status 
with SCTP_PR_SCTP_ALL instead)
Merging bpf/master (bd8be2cf8b69 Merge branch 
'nfp-fix-pedit-set-action-offloads')
Merging ipsec/master (9d200fd1 xfrm: policy: use hlist rcu variants on 
insert)
Merging netfilter/master (cb20f2d2c050 netfilter: xt_nat: fix DNAT target for 
shifted portmap ranges)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (3baafeffa48a iwlwifi: 1000: set the TFD queue 
size)
Merging mac80211/master (8d0be26c781a mac80211_hwsim: fix module init error 
paths for netlink)
Merging rdma-fixes/for-rc (a3671a4f973e RDMA/ucma: Fix Spectre v1 vulnerability)
Merging sound-current/for-linus (709ae62e8e6d ALSA: hda/realtek - Cannot adjust 
speaker's volume on Dell XPS 27 7760)
Merging sound-asoc-fixes/for-linus (98027961025e Merge branch 'asoc-4.19' into 
asoc-linus)
Merging regmap-fixes/for-linus (7876320f8880 Linux 4.19-rc4)
Merging regulator-fixes/for-linus (35a7f35ad1b1 Linux 4.19-rc8)
Merging spi-fixes/for-linus (bc7a6ca6f446 Merge branch 'spi-4.19' into 
spi-linus)
Merging pci-current/for-linus (2edab4df98d9 PCI: Expand the "PF" acronym in 
Kconfig help text)
Merging driver-core.current/driver-core-linus (7876320f8880 Linux 4.19-rc4)
Merging tty.current/tty-linus (202dc3cc10b4 serial: sh-sci: Fix receive on 
SCIFA/SCIFB variants with DMA)
Merging usb.current/usb-linus (665c365a77fb USB: fix the usbfs flag 
sanitization for control transfers)
Merging usb-gadget-fixes/fixes (d9707490077b usb: dwc2: Fix call location of 
dwc2_check_core_endiannes

Re: [Xen-devel] linux-next: Tree for Oct 18 (xen)

2016-10-18 Thread Boris Ostrovsky 
This has already been reported:

http://marc.info/?l=linux-kernel&m=147628583512117&w=3

Thanks.
-boris



On 10/18/2016 10:56 AM, Randy Dunlap wrote:
> On 10/17/16 19:27, Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20161017:
>
> on i386:
>
> arch/x86/built-in.o: In function `xen_start_kernel':
> (.init.text+0x2fa6): undefined reference to `xen_cpu_dead'
> arch/x86/built-in.o: In function `xen_start_kernel':
> (.init.text+0x2fab): undefined reference to `xen_cpu_up_prepare'
> arch/x86/built-in.o: In function `xen_start_kernel':
> (.init.text+0x2fc7): undefined reference to `xen_cpu_up_online'
>
>
> Full randconfig file is attached.
>
>
> Reported-by: Randy Dunlap 
>
>
> ___
> Xen-devel mailing list
> xen-de...@lists.xen.org
> https://lists.xen.org/xen-devel

Re: linux-next: Tree for Oct 18 (xen)

2016-10-18 Thread Randy Dunlap 
On 10/17/16 19:27, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20161017:


on i386:

arch/x86/built-in.o: In function `xen_start_kernel':
(.init.text+0x2fa6): undefined reference to `xen_cpu_dead'
arch/x86/built-in.o: In function `xen_start_kernel':
(.init.text+0x2fab): undefined reference to `xen_cpu_up_prepare'
arch/x86/built-in.o: In function `xen_start_kernel':
(.init.text+0x2fc7): undefined reference to `xen_cpu_up_online'


Full randconfig file is attached.


Reported-by: Randy Dunlap 
-- 
~Randy
#
# Automatically generated file; DO NOT EDIT.
# Linux/i386 4.9.0-rc1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
CONFIG_X86=y
CONFIG_INSTRUCTION_DECODER=y
CONFIG_OUTPUT_FORMAT="elf32-i386"
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_MMU=y
CONFIG_ARCH_MMAP_RND_BITS_MIN=8
CONFIG_ARCH_MMAP_RND_BITS_MAX=16
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_SG_DMA_LENGTH=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_HAS_CPU_RELAX=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_X86_32_SMP=y
CONFIG_X86_32_LAZY_GS=y
CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_FIX_EARLYCON_MEM=y
CONFIG_DEBUG_RODATA=y
CONFIG_PGTABLE_LEVELS=3
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y

#
# General setup
#
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
# CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
CONFIG_HAVE_KERNEL_LZ4=y
# CONFIG_KERNEL_GZIP is not set
# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_XZ is not set
CONFIG_KERNEL_LZO=y
# CONFIG_KERNEL_LZ4 is not set
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_FHANDLE=y
# CONFIG_USELIB is not set
CONFIG_HAVE_ARCH_AUDITSYSCALL=y

#
# IRQ subsystem
#
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_GENERIC_IRQ_CHIP=y
CONFIG_IRQ_DOMAIN=y
CONFIG_IRQ_DOMAIN_HIERARCHY=y
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_ARCH_CLOCKSOURCE_DATA=y
CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
CONFIG_GENERIC_CMOS_UPDATE=y

#
# Timers subsystem
#
CONFIG_TICK_ONESHOT=y
CONFIG_NO_HZ_COMMON=y
# CONFIG_HZ_PERIODIC is not set
CONFIG_NO_HZ_IDLE=y
# CONFIG_NO_HZ is not set
# CONFIG_HIGH_RES_TIMERS is not set

#
# CPU/Task time and stats accounting
#
CONFIG_TICK_CPU_ACCOUNTING=y
# CONFIG_IRQ_TIME_ACCOUNTING is not set
CONFIG_BSD_PROCESS_ACCT=y
# CONFIG_BSD_PROCESS_ACCT_V3 is not set

#
# RCU Subsystem
#
CONFIG_TREE_RCU=y
# CONFIG_RCU_EXPERT is not set
CONFIG_SRCU=y
# CONFIG_TASKS_RCU is not set
CONFIG_RCU_STALL_COMMON=y
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_EXPEDITE_BOOT is not set
CONFIG_BUILD_BIN2C=y
CONFIG_IKCONFIG=y
# CONFIG_IKCONFIG_PROC is not set
CONFIG_LOG_BUF_SHIFT=17
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
CONFIG_NMI_LOG_BUF_SHIFT=13
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
CONFIG_CGROUPS=y
# CONFIG_MEMCG is not set
# CONFIG_BLK_CGROUP is not set
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_CFS_BANDWIDTH=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_CGROUP_PIDS=y
# CONFIG_CGROUP_FREEZER is not set
CONFIG_CPUSETS=y
# CONFIG_PROC_PID_CPUSET is not set
# CONFIG_CGROUP_DEVICE is not set
# CONFIG_CGROUP_CPUACCT is not set
# CONFIG_CGROUP_PERF is not set
# CONFIG_CGROUP_DEBUG is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
# CONFIG_IPC_NS is not set
CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_SCHED_AUTOGROUP=y
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_SYSFS_DEPRECATED_V2 is not set
# CONFIG_RELAY is not set
# CONFIG_BLK_DEV_INITRD is not set
# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
CONFIG_HAVE_UID16=y
CONFIG_SYSCTL_EXCEPTION_TRACE=y
CONFIG_HAVE_PCSPKR_PLATFORM=y
CONFIG_BPF=y
# CONFIG_EXPERT is not set
CONFIG_UID16=y
CONFIG_MULTIUSER=y
CONFIG_SGETMASK_SYSCALL=y
CONFIG_SYSFS_SYSCALL=y
# CONFIG_SYSCTL_SYSCALL is not set
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is

linux-next: Tree for Oct 18

2016-10-17 Thread Stephen Rothwell 
Hi all,

Changes since 20161017:

The drm-intel tree gained build failures so I used the version from
next-20161017.

The akpm-current tree still had its build failures for which I applied
2 patches.

Non-merge commits (relative to Linus' tree): 910
 1213 files changed, 32579 insertions(+), 17418 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 243 trees (counting Linus' and 34 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 (1001354ca341 Linux 4.9-rc1)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when 
not configured)
Merging arc-current/for-curr (27f3d2a3b59f ARC: [build] Support gz, lzma 
compressed uImage)
Merging arm-current/fixes (fb833b1fbb68 ARM: fix delays)
Merging m68k-current/for-linus (6736e65effc3 m68k: Migrate exception table 
users off module.h and onto extable.h)
Merging metag-fixes/fixes (35d04077ad96 metag: Only define 
atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (b79331a5eb9f powerpc/powernv/pci: Fix m64 checks 
for SR-IOV and window alignment)
Merging sparc/master (4c1fad64eff4 Merge tag 'for-f2fs-4.9' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)
Merging net/master (3dfcb4f56f35 Merge branch 'net-driver-autoload')
CONFLICT (content): Merge conflict in drivers/net/ethernet/qlogic/Kconfig
Applying: qed*: merge fix for CONFIG_INFINIBAND_QEDR Kconfig move
Merging ipsec/master (7f92083eb58f vti6: flush x-netns xfrm cache when vti 
interface is removed)
Merging netfilter/master (6d3a4c404648 strparser: Propagate correct error code 
in strp_recv())
Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes')
Merging wireless-drivers/master (1ea2643961b0 ath6kl: add Dell OEM SDIO I/O for 
the Venue 8 Pro)
Merging mac80211/master (f4a067f9ffca mac80211: move struct aead_req off the 
stack)
Merging sound-current/for-linus (fdd8218d7d1b ALSA: line6: fix a crash in 
line6_hwdep_write())
Merging pci-current/for-linus (15480f3ab7a8 PCI: layerscape: Fix drvdata usage 
before assignment)
Merging driver-core.current/driver-core-linus (1001354ca341 Linux 4.9-rc1)
Merging tty.current/tty-linus (1001354ca341 Linux 4.9-rc1)
Merging usb.current/usb-linus (a19b882c07a6 wusb: Stop using the stack for sg 
crypto scratch space)
Merging usb-gadget-fixes/fixes (1001354ca341 Linux 4.9-rc1)
Merging usb-serial-fixes/usb-linus (ca006f785fbf USB: serial: ftdi_sio: add 
support for Infineon TriBoard TC2X7)
Merging usb-chipidea-fixes/ci-for-usb-stable (6b7f456e67a1 usb: chipidea: host: 
fix NULL ptr dereference during shutdown)
Merging staging.current/staging-linus (c89d98e224b4 staging/lustre/llite: Move 
unstable_stats from sysfs to debugfs)
Merging char-misc.current/char-misc-linus (1001354ca341 Linux 4.9-rc1)
Merging input-current/for-linus (1134ca268e73 Merge branch 'next' into 
for-linus)
Merging crypto-current/master (c3afafa47898 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of 
git://git.infradead.org/users/pcmoore/audit)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms 
vs module insertion race.)
Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in 
error inter

Re: linux-next: Tree for Oct 18 (netdev: nf_tables_bridge.c)

2013-10-27 Thread Pablo Neira Ayuso 
On Sat, Oct 19, 2013 at 10:22:29AM -0700, Randy Dunlap wrote:
> On 10/19/13 05:50, Mark Brown wrote:
> > Hi all,
> > 
> > I've uploaded today's linux-next tree to the master branch of the
> > repository below:
> > 
> > git://gitorious.org/thierryreding/linux-next.git
> > 
> > A next-20131018 tag is also provided for convenience.
> > 
> > A few new conflicts today but otherwise uneventful.  x86_64 allmodconfig
> > builds after each merge but no other build tests were done.
> 
> on i386:
> 
> when CONFIG_NF_TABLES[_MODULE] is not enabled,
> but CONFIG_NF_TABLES_BRIDGE is enabled:

Patch attached, thanks for reporting.
>From 2724ade097d59aaa3879ca485ae0fd61994cbc38 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso 
Date: Mon, 28 Oct 2013 00:18:33 +0100
Subject: [PATCH] netfilter: bridge: fix nf_tables bridge dependencies with
 main core

when CONFIG_NF_TABLES[_MODULE] is not enabled,
but CONFIG_NF_TABLES_BRIDGE is enabled:

net/bridge/netfilter/nf_tables_bridge.c: In function 'nf_tables_bridge_init_net':
net/bridge/netfilter/nf_tables_bridge.c:24:5: error: 'struct net' has no member named 'nft'
net/bridge/netfilter/nf_tables_bridge.c:25:9: error: 'struct net' has no member named 'nft'
net/bridge/netfilter/nf_tables_bridge.c:28:2: error: 'struct net' has no member named 'nft'
net/bridge/netfilter/nf_tables_bridge.c:30:34: error: 'struct net' has no member named 'nft'
net/bridge/netfilter/nf_tables_bridge.c:35:11: error: 'struct net' has no member named 'nft'
net/bridge/netfilter/nf_tables_bridge.c: In function 'nf_tables_bridge_exit_net':
net/bridge/netfilter/nf_tables_bridge.c:41:27: error: 'struct net' has no member named 'nft'
net/bridge/netfilter/nf_tables_bridge.c:42:11: error: 'struct net' has no member named 'nft'

Reported-by: Randy Dunlap 
Reported-by: kbuild test robot 
Signed-off-by: Pablo Neira Ayuso 
---
 net/bridge/netfilter/Kconfig |1 +
 1 file changed, 1 insertion(+)

diff --git a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig
index 68f8128..5ca74a0 100644
--- a/net/bridge/netfilter/Kconfig
+++ b/net/bridge/netfilter/Kconfig
@@ -3,6 +3,7 @@
 #
 #
 config NF_TABLES_BRIDGE
+	depends on NF_TABLES
 	tristate "Ethernet Bridge nf_tables support"
 
 menuconfig BRIDGE_NF_EBTABLES
-- 
1.7.10.4

linux-next: Tree for Oct 18

2013-10-19 Thread Mark Brown 
Hi all,

I've uploaded today's linux-next tree to the master branch of the
repository below:

git://gitorious.org/thierryreding/linux-next.git

A next-20131018 tag is also provided for convenience.

A few new conflicts today but otherwise uneventful.  x86_64 allmodconfig
builds after each merge but no other build tests were done.

Thanks,
Mark


signature.asc
Description: Digital signature

linux-next: Tree for Oct 18

2012-10-17 Thread Stephen Rothwell 
Hi all,

Changes since 201201017:

The m68knommu gained conflicts against the m68k-current tree.

The l2-mtd tree still had its build failure so I used the version from
next-20121011.

The hid tree lost its conflict.

The sound tree gained a build failure for which I reverted 2 commits.

The signal tree lost its build failure.

The akpm tree lost a patch that turned up elsewhere.



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" as mentioned in the FAQ on the wiki
(see below).

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 for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 204 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (1867353 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging fixes/master (12250d8 Merge branch 'i2c-embedded/for-next' of 
git://git.pengutronix.de/git/wsa/linux)
Merging kbuild-current/rc-fixes (b1e0d8b kbuild: Fix gcc -x syntax)
Merging arm-current/fixes (3d6ee36 Merge branch 'late-for-linus' of 
git://git.linaro.org/people/rmk/linux-arm)
Merging m68k-current/for-linus (92f79db m68k: Remove empty #ifdef/#else/#endif 
block)
Merging powerpc-merge/merge (fd3bc66 Merge tag 'disintegrate-powerpc-20121009' 
into merge)
Merging sparc/master (1867353 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (1867353 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging sound-current/for-linus (10f571d ALSA: emu10k1: add chip details for 
E-mu 1010 PCIe card)
Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding 
is disabled)
Merging wireless/master (290eddc Merge branch 'for-john' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
Merging driver-core.current/driver-core-linus (ddffeb8 Linux 3.7-rc1)
Merging tty.current/tty-linus (178e485 staging: dgrp: check return value of 
alloc_tty_driver)
Merging usb.current/usb-linus (bf90ff5 USB: spcp8x5: fix port-data memory leak)
Merging staging.current/staging-linus (ddffeb8 Linux 3.7-rc1)
Merging char-misc.current/char-misc-linus (ddffeb8 Linux 3.7-rc1)
Merging input-current/for-linus (0cc8d6a Merge branch 'next' into for-linus)
Merging md-current/for-linus (72f36d5 md: refine reporting of resync/reshape 
delays.)
Merging audit-current/for-linus (c158a35 audit: no leading space in 
audit_log_d_path prefix)
Merging crypto-current/master (c9f97a2 crypto: x86/glue_helper - fix storing of 
new IV in CBC encryption)
Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
Merging dwmw2/master (244dc4e Merge 
git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to 
inline functions)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs 
formatting)
Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for 
of_parse_phandle_with_args)
Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using 
proper "spi:" modalias prefixes.)
Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, 
remove cast)
Merging asm-generic/master (c37d615 Merge branch 'disintegrate-asm-generic' of 
git://git.infradead.org/users/dhowells/linux-headers into asm-generic)
Merging arm/for-next (3d6ee36 Merge branch 'late-for-linus' of