linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiri Kosina <jkosina@suse.cz>
To: Stefan Kriwanek <mail@stefankriwanek.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the hid tree
Date: Wed, 8 Jun 2011 09:50:20 +0200 (CEST)	[thread overview]
Message-ID: <alpine.LNX.2.00.1106080949470.22872@pobox.suse.cz> (raw)
In-Reply-To: <4DEF2412.3040707@stefankriwanek.de>

On Wed, 8 Jun 2011, Stefan Kriwanek wrote:

> Hi Jiri,
> 
> I can only guess that this has to do with my patch not made by `git 
> --diff` but simply `diff -up 
> /dev/null/linux-2.6.39-speedlink/drivers/hid/hid-speedlink.c`
> 
> --- /dev/null	2011-05-27 13:53:55.863652998 +0200
> +++ linux-2.6.39-speedlink/drivers/hid/hid-speedlink.c	2011-05-27 18:00:34.719863577 +0200
> 
> I am sorry if I caused the disturbance. However, after reading 
> Documentation/SubmittitingPatches etc. I didn't know of any special 
> measure to undertake when adding new files - If so, maybe one should 
> consider updating the documention?.

Bah, no need to be sorry, it's my fault. Forgot to do 'git add' after I 
have resolved the conflict.

Fixed now in my tree and pushed out.

-- 
Jiri Kosina
SUSE Labs

  reply	other threads:[~2011-06-08  7:50 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-08  3:03 linux-next: build failure after merge of the hid tree Stephen Rothwell
2011-06-08  7:26 ` Stefan Kriwanek
2011-06-08  7:50   ` Jiri Kosina [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-07  1:06 Stephen Rothwell
2024-05-07  7:22 ` Kenny Levinsen
2024-04-11  0:51 Stephen Rothwell
2024-04-11  7:17 ` Benjamin Tissoires
2024-02-28  3:56 Stephen Rothwell
2022-07-25  0:40 Stephen Rothwell
2022-07-25  9:42 ` Jiri Kosina
2022-07-27  1:11   ` Stephen Rothwell
2021-12-03  7:01 Stephen Rothwell
2021-12-03  8:09 ` Greg Kroah-Hartman
2021-05-27  5:26 Stephen Rothwell
2021-05-27  8:14 ` Jiri Kosina
2021-05-27  8:25   ` Hans de Goede
2021-05-27 13:22     ` Naresh Kamboju
2021-05-27 13:42     ` Jiri Kosina
2019-10-04  0:28 Stephen Rothwell
2019-10-04  6:55 ` Hans de Goede
2016-12-11 23:59 Stephen Rothwell
2016-12-12  8:50 ` Jiri Kosina
2012-06-29  2:47 Stephen Rothwell
2012-06-29 13:03 ` Jiri Kosina
2011-12-19  1:34 Stephen Rothwell
2011-12-19  8:21 ` Jiri Kosina
2011-11-29  1:00 Stephen Rothwell
2011-11-29  1:30 ` Jeremy Fitzhardinge
2011-04-07  1:06 Stephen Rothwell
2011-04-07 13:00 ` Alan Ott
2011-04-08 23:54 ` Jiri Kosina

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=alpine.LNX.2.00.1106080949470.22872@pobox.suse.cz \
    --to=jkosina@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mail@stefankriwanek.de \
    --cc=sfr@canb.auug.org.au \
    /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).