linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felipe Balbi <balbi@ti.com>
To: Behan Webster <behanw@converseincode.com>
Cc: <balbi@ti.com>, <davem@davemloft.net>,
	<linux-usb@vger.kernel.org>, <netfilter-devel@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH V2 2/3] Remove VLAIS usage from gadget code
Date: Thu, 1 Nov 2012 09:21:16 +0200	[thread overview]
Message-ID: <20121101072116.GA32013@arwen.pp.htv.fi> (raw)
In-Reply-To: <509144C0.8000601@converseincode.com>

[-- Attachment #1: Type: text/plain, Size: 1648 bytes --]

Hi,

On Wed, Oct 31, 2012 at 11:33:20AM -0400, Behan Webster wrote:
> On 12-10-31 09:28 AM, Felipe Balbi wrote:
> >hi,
> >
> >On Tue, Oct 30, 2012 at 05:18:56PM -0400, Behan Webster wrote:
> >>The use of variable length arrays in structs (VLAIS) in the Linux Kernel code
> >>precludes the use of compilers which don't implement VLAIS (for instance the
> >>Clang compiler). This patch instead calculates offsets into the kmalloc-ed
> >>memory buffer using macros from valign.h.
> >>
> >>Signed-off-by: Behan Webster <behanw@converseincode.com>
> >this won't apply after the current cleanups I applied to gadget code
> >from Sebastian.
> Makes sense. I'll try it with your repo, and regenerate.
> 
> >If someone takes this patch, it will generate a series of annoying,
> >hard-to-figure-out conflicts (at least judging by the looks of
> >$SUBJECT).
> I just tried the patch on your git.kernel.org repo and thankfully
> there is only one hunk which is rejected, and fortunately the reason
> is trivial (descriptors -> fs_descriptors).
> 
> Was:
> -        func->function.descriptors = data->fs_descs;
> +        func->function.descriptors = fs_descs;
> 
> Now is:
> -        func->function.fs_descriptors = data->fs_descs;
> +        func->function.fs_descriptors = fs_descs;
> 
> I will regenerate the patch set, but obviously the new gadget patch
> in the V3 patchset will only apply to the USB repo, and not to the
> netfilter repo.

then we can merge to net tree and handle the conflicts when merging to
Linus, that'd be fine by me as long as people know how to solve the
conflict properly ;-)

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

  reply	other threads:[~2012-11-01  7:27 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-30 21:18 [PATCH V2 0/3] Removing the use of VLAIS from USB Gadget and netfilter Behan Webster
2012-10-30 21:18 ` [PATCH V2 1/3] Helper macros used for replacing the use of VLAIS Behan Webster
2012-10-30 21:18 ` [PATCH V2 2/3] Remove VLAIS usage from gadget code Behan Webster
2012-10-31 13:28   ` Felipe Balbi
2012-10-31 15:33     ` Behan Webster
2012-11-01  7:21       ` Felipe Balbi [this message]
2012-11-01 15:03         ` David Miller
2012-12-03 11:57         ` Sebastian Andrzej Siewior
2012-12-03 18:57           ` Behan Webster
2012-12-04 22:24             ` Sebastian Andrzej Siewior
2012-12-04 23:50               ` Behan Webster
2012-12-05 23:48               ` [llvmlinux] " Bryce Lelbach
2012-10-30 21:18 ` [PATCH V2 3/3] Remove VLAIS usage from netfilter Behan Webster
2012-10-31 16:45 ` [PATCH V2 0/3] Removing the use of VLAIS from USB Gadget and netfilter David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121101072116.GA32013@arwen.pp.htv.fi \
    --to=balbi@ti.com \
    --cc=behanw@converseincode.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).