Linux-WPAN Archive on lore.kernel.org
 help / color / Atom feed
From: David Miller <davem@davemloft.net>
To: stefan@datenfreihafen.org
Cc: linux-wpan@vger.kernel.org, alex.aring@gmail.com, netdev@vger.kernel.org
Subject: Re: pull-request: ieee802154 for net 2019-04-25
Date: Mon, 29 Apr 2019 18:21:09 -0400 (EDT)
Message-ID: <20190429.182109.2278488103649846421.davem@davemloft.net> (raw)
In-Reply-To: <20190425160311.19767-1-stefan@datenfreihafen.org>

From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Thu, 25 Apr 2019 18:03:11 +0200

> An update from ieee802154 for your *net* tree.
> 
> Another fix from Kangjie Lu to ensure better checking regmap updates in the
> mcr20a driver. Nothing else I have pending for the final release.
> 
> If there are any problems let me know.

Pulled, thanks Stefan.

> During the preparation of this pull request a workflow question on
> my side came up and wonder if you (or some subsystem maintainer
> sending you pull requests) does have a comment on this. The
> ieee802154 subsystem has a low activity in the number of patches
> coming through it. I still wanted to pull from your net tree
> regularly to test if changes have implications to it. During this
> pulls I often end up with merge of the remote tracking branch. Which
> in the end could mean that I would have something like 3-4 merge
> commits in my tree with only one actual patch I want to send over to
> you. Feels and looks kind of silly to be honest.
> 
> How do other handle this? Just merge once every rc? Merge just
> before sending a pull request? Never merge, wait for Dave to pull
> and merge and do a pull of his tree directly afterwards?

I would say never pull from the net tree until right after I pull your
tree and thus you can do a clean fast-forward merge.

If you want to test, right before you send me a pull request do a test
pull into a local throw-away branch.

Otherwise I'll handle conflicts and merge issues.

Thanks.

  reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-25 16:03 Stefan Schmidt
2019-04-29 22:21 ` David Miller [this message]
2019-04-30 10:24   ` Stefan Schmidt

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=20190429.182109.2278488103649846421.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=alex.aring@gmail.com \
    --cc=linux-wpan@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=stefan@datenfreihafen.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

Linux-WPAN Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-wpan/0 linux-wpan/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-wpan linux-wpan/ https://lore.kernel.org/linux-wpan \
		linux-wpan@vger.kernel.org
	public-inbox-index linux-wpan

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-wpan


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git