lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <20190429.182109.2278488103649846421.davem@davemloft.net> Date: Mon, 29 Apr 2019 18:21:09 -0400 (EDT) From: David Miller <davem@...emloft.net> To: stefan@...enfreihafen.org Cc: linux-wpan@...r.kernel.org, alex.aring@...il.com, netdev@...r.kernel.org Subject: Re: pull-request: ieee802154 for net 2019-04-25 From: Stefan Schmidt <stefan@...enfreihafen.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.
Powered by blists - more mailing lists